klemens
7be541f281
spelling fixes
2017-03-07 13:38:06 +04:00
Marko Mäkelä
5044dae239
Merge 10.0 into 10.1
2017-01-10 14:30:11 +02:00
Vladislav Vaintroub
eaf6b053b8
MDEV-11087 Search path for my.ini is wrong for default installation
...
Add <install_root>/data/my.ini to the search path - this my.ini location
is used since MariaDB 5.2
2017-01-06 16:25:25 +01:00
Sergei Golubchik
3b0c7ac1f9
Merge branch '10.0' into 10.1
2016-03-21 13:02:53 +01:00
Otto Kekäläinen
1777fd5f55
Fix spelling: occurred, execute, which etc
2016-03-04 02:09:37 +02:00
Sergei Golubchik
a5679af1b1
Merge branch '10.0' into 10.1
2016-02-23 21:35:05 +01:00
Sergei Golubchik
271fed4106
Merge branch '5.5' into 10.0
2016-02-15 22:50:59 +01:00
Sergei Golubchik
2db62f686e
Merge branch '10.0' into 10.1
2015-03-07 13:21:02 +01:00
Sergei Golubchik
cbf8cdc252
MDEV-7530 !includedir reads files in random order
2015-02-25 09:43:31 +01:00
Monty
d7d589dc01
Push for testing of encryption
2015-02-10 10:21:17 +01:00
Sergei Golubchik
df37215efb
small cleanup of my_default.c
2015-02-10 10:21:15 +01:00
Nirbhay Choubey
3c2c036248
MDEV-6939 : Dots in file names of configuration files
...
Use fn_ext2() to get the file extension from last occurrence
of FN_EXTCHAR ('.') instead.
2014-10-29 22:31:19 -04:00
Nirbhay Choubey
4dec4e1175
MDEV-6939 : Dots in file names of configuration files
...
Use fn_ext2() to get the file extension from last occurrence
of FN_EXTCHAR ('.') instead. Also made some cosmetic changes
in mysys/mf_fn_ext.c.
2014-10-29 22:12:31 -04:00
Sergei Golubchik
91c47e6fdf
MDEV-6485 Hard-coded paths in the source cannot be opt-out
...
when looking for my.cnf files: if DEFAULT_SYSCONFDIR (or INSTALL_SYSCONFDIR)
is specified (for rpms it always is), use that instead of hardcoded /etc path.
2014-08-03 17:13:56 +02:00
Sergei Golubchik
b7b5f6f1ab
10.0-monty merge
...
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
2013-07-21 16:39:19 +02:00
Michael Widenius
068c61978e
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
