summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* MDEV-7901: re-implement analyze table for low impactOleksandr Byelkin2016-08-032-1/+2
* MDEV-10238 - tokudb_bugs.db938 fails due to connection logging (also affectsSergey Vojtovich2016-07-211-0/+5
* clarify ER_CANT_DROP_FIELD_OR_KEYSergei Golubchik2016-07-024-5/+5
* Merge branch '10.1' into 10.2Sergei Golubchik2016-06-30582-10482/+32093
|\
| * Merge remote-tracking branch 'refs/remotes/github/10.1' into 10.1Sergei Golubchik2016-06-282-0/+28
| |\
| | * Output more information when assertionJan Lindström2016-06-282-0/+28
| * | Merge branch 'connect/10.1' into 10.1Sergei Golubchik2016-06-2812-630/+839
| |\ \
| | * | - Add column pattern and table type argument to catalog tablesOlivier Bertrand2016-06-2011-61/+75
| | * | Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1Olivier Bertrand2016-06-209-10/+11
| | |\ \
| | * | | - Possibly fix MDEV-10179 Reset remote tables when re-openingOlivier Bertrand2016-06-137-15/+41
| | * | | - Fix MDEV-10111 Reconize unsigned integers when creating tables via srcdefOlivier Bertrand2016-06-024-6/+12
| | * | | - Reconize the JDBC type -7 (BIT)Olivier Bertrand2016-05-2623-737/+1153
| | * | | - Fix failing json_udf_bin test when --psOlivier Bertrand2016-05-242-42/+240
| | * | | - Alternative versions of the java JdbcInterfaceOlivier Bertrand2016-05-246-0/+2164
| | * | | - New version of the java JdbcInterfaceOlivier Bertrand2016-05-232-78/+151
| | * | | Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1Olivier Bertrand2016-05-223591-303645/+721309
| | |\ \ \
| | * | | | - Fix wrong return from ExecuteQueryOlivier Bertrand2016-05-212-2/+2
| | * | | | - JDBC using separate jmethodID for data typesOlivier Bertrand2016-05-212-35/+80
| | * | | | - JDBC tables can be connected via foreign server wrapperOlivier Bertrand2016-05-205-297/+373
| | * | | | - Remove REQUIRED option that caused compilation to failOlivier Bertrand2016-05-121-3/+3
| | * | | | - Fix some typo ... causing crash!Olivier Bertrand2016-05-121-2/+2
| | * | | | - Continue working on the JDBC table typeOlivier Bertrand2016-05-129-141/+207
| | * | | | - Make the JVM lib dynamically loadedOlivier Bertrand2016-05-094-112/+171
| | * | | | - Remove gcc compiling errors and warningsOlivier Bertrand2016-05-062-15/+23
| | * | | | - Try to fix MDEV-9950 (not tested yet)Olivier Bertrand2016-05-059-81/+90
| | * | | | - Add the JdbcInterface.java to the projectOlivier Bertrand2016-04-271-0/+639
| | * | | | - Add the JDBC table type compilation for CMAKE.Olivier Bertrand2016-04-272-55/+86
| * | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-28505-9642/+24900
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | remove incorrect .gitattributesSergei Golubchik2016-06-281-25/+0
| | * | | | Fixed testcase check failure after db938.testmariadb-10.0.26Sergey Vojtovich2016-06-232-0/+2
| | * | | | Merge following commit from 5.5:Jan Lindström2016-06-2314-42/+68
| | * | | | compilation failuresSergei Golubchik2016-06-221-2/+2
| | * | | | MDEV-9479: Enable OQGRAPH Engine to compile with Boost-1.60+Dimitri John Ledkov2016-06-221-1/+1
| | * | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-22512-9766/+29691
| | |\ \ \ \
| | | * | | | Fixed for failures in buildbot: TokuDBSergei Golubchik2016-06-221-0/+2
| | | * | | | Fixed for failures in buildbot: ReplicationSergei Golubchik2016-06-221-8/+0
| | | * | | | Fixed for failures in buildbot: WindowsSergei Golubchik2016-06-221-2/+2
| | | * | | | Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-06-2141-236/+8781
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '10.0' of https://github.com/MariaDB/server into 10.0Olivier Bertrand2016-06-201-36/+0
| | | | |\ \ \ \
| | | | * | | | | - Possibly fix MDEV-10179 Reset remote tables when re-openingOlivier Bertrand2016-06-1318-11/+1144
| | | | * | | | | git90.msg + git91.msgOlivier Bertrand2016-06-0213-74/+2039
| | | | * | | | | - New version of the java JdbcInterfaceOlivier Bertrand2016-05-232-78/+151
| | | | * | | | | Merge branch '10.0' of https://github.com/MariaDB/server into 10.0Olivier Bertrand2016-05-223574-301371/+719517
| | | | |\ \ \ \ \
| | | | * | | | | | - Fix wrong return from ExecuteQueryOlivier Bertrand2016-05-212-2/+2
| | | | * | | | | | Commit changes made from 10.1Olivier Bertrand2016-05-215-332/+453
| | | | * | | | | | Add forgotten changes made on 10.1Olivier Bertrand2016-05-124-12/+26
| | | | * | | | | | Add all changes made on 10.1Olivier Bertrand2016-05-1214-159/+5398
| | | * | | | | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-21472-9527/+20910
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'merge-xtradb-5.6' into 0.0Sergei Golubchik2016-06-2140-1032/+762
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | 5.6.30-76.3Sergei Golubchik2016-06-2140-1006/+765