summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-8302: Duplicate key with parallel replication10.0-custombldKristian Nielsen2015-06-293-4/+61
* MDEV-5309 - RENAME TABLE does not check for existence of the table's enginemariadb-10.0.20Sergei Golubchik2015-06-172-0/+5
* MDEV-5977 MariaDB 10.0 is not installable on Trusty when "trusty-updates univ...Sergei Golubchik2015-06-172-39/+71
* MDEV-8287 DROP TABLE suppresses all engine errorsSergei Golubchik2015-06-168-57/+68
* MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4Sergei Golubchik2015-06-1612-46/+40
* MDEV-8128 cmake fails to detect boost librariesSergei Golubchik2015-06-161-0/+1
* MDEV-8183 Adding option mysqldump --no-data-medSergei Golubchik2015-06-161-7/+12
* Merge branch 'connect-10.0' into 10.0Sergei Golubchik2015-06-1688-1226/+1522
|\
| * Merge branch 'ob-10.0' into 10.0Olivier Bertrand2015-06-051250-24765/+55504
| |\
| | * Commit merge resolved filesOlivier Bertrand2015-06-055-115/+0
| | * Commit merge resolved filesOlivier Bertrand2015-06-051197-25185/+55682
| | |\
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-032-4/+4
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-031-2/+2
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-032-0/+14
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-031-8/+8
| | * | Fix swapping key numeric values on Big Endian machines.Olivier Bertrand2015-06-031-1/+31
| | * | Fix handling of NULL values when reading from tables.Olivier Bertrand2015-06-022-6/+5
| | * | Add unicode ODBC types to the types recognized by CONNECT.Olivier Bertrand2015-05-307-24/+80
| | * | Change all preprocessor compiler directives to use __WIN__ as the mean ofOlivier Bertrand2015-05-2757-482/+483
| | * | JSONColumns and XMLColumns revisited. They can retrieve their parameters dire...Olivier Bertrand2015-05-2615-292/+369
| | * | Security: EOM modules must now be loaded from the plugin directory.Olivier Bertrand2015-05-203-18/+64
| | * | Json array index (position) was badly set for default array settingOlivier Bertrand2015-05-171-1/+1
| | * | In BIN table date_format now imply by default field_format='C'.Olivier Bertrand2015-05-177-324/+318
| | * | Fix a bug in BIN buffer initialisation (in FIXFAM::AllocateBuffer)Olivier Bertrand2015-05-156-137/+173
| | * | Make BIN table files more flexible with new column format.Olivier Bertrand2015-05-135-44/+148
| * | | Commit win packaging & upgrade_wizard filesOlivier Bertrand2015-06-0512-1614/+1614
| |/ /
| * | resolving conflictOlivier Bertrand2015-05-1056-359/+334
| |\ \
| | * | Get rid of more GCC warnings about unused parametersOlivier Bertrand2015-05-106-35/+50
| | * | Get rid of GCC warnings about unused parametersOlivier Bertrand2015-05-0956-769/+744
| | * | Typo to check buildbotOlivier Bertrand2015-05-083-53/+12
| * | | Get rid of more GCC warnings about unused parametersOlivier Bertrand2015-05-106-35/+50
| * | | Get rid of more GCC warnings about unused parametersOlivier Bertrand2015-05-101-417/+417
| * | | Typo to check buildbotOlivier Bertrand2015-05-103-53/+12
| * | | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2015-05-0722-90/+295
| |\ \ \ | | |/ /
| | * | Heidi stuffOlivier Bertrand2015-05-072-100/+100
| | * | Fix a bug in init_table_share that caused syntax error with Boolean options:Olivier Bertrand2015-05-072-10/+17
| | * | - Fix a regression bug on (XML) HTML tables.Olivier Bertrand2015-05-057-18/+201
| | * | Fix MDEV-8090 in tabmysql.cppOlivier Bertrand2015-05-026-2/+20
| * | | Heidi stuffOlivier Bertrand2015-05-072-100/+100
* | | | after-merge fixesSergei Golubchik2015-06-1613-41/+22
* | | | Fix test case innodb.xa_recovery crash on xtradb.Jan Lindström2015-06-162-3/+4
* | | | Fix test failure on main.partition_innodb.Jan Lindström2015-06-161-13/+15
* | | | Fix crash on test innodb.innodb-virtual-columns. We should createJan Lindström2015-06-161-4/+5
* | | | Fix innochecksum build failure.Jan Lindström2015-06-161-0/+15
* | | | after merge fixes: InnoDB and XtraDBSergei Golubchik2015-06-162-6/+10
* | | | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-06-1618-27/+17
|\ \ \ \
| * | | | 5.6.25Sergei Golubchik2015-06-1617-26/+16
* | | | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-06-1626-544/+465
|\ \ \ \ \
| * | | | | 5.6.24-72.2Sergei Golubchik2015-06-1626-542/+463
* | | | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2015-06-1616-237/+437
|\ \ \ \ \ \