summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Dump skip_flush, queries get stuck. Instead, just allow to switch on Nagle's ...10.2-wlad-batch-modeVladislav Vaintroub2016-07-143-23/+23
* Properly check for vio_io_wait return codeVladislav Vaintroub2016-07-132-2/+2
* Fix setting/clearing batch modeVladislav Vaintroub2016-07-132-3/+26
* Prototype for batch mode THD variableVladislav Vaintroub2016-07-133-1/+15
* MDEV-10084: SQL batch united responseOleksandr Byelkin2016-07-041-0/+1
* bump the VERSIONDaniel Bartholomew2016-07-041-1/+1
* Removing duplicate code in double-to-longlong conversion.Alexander Barkov2016-07-0311-119/+118
* fix ALTER TABLE .. DROP CONSTRAINT IF NOT EXISTSmariadb-10.2.1Sergei Golubchik2016-07-023-1/+5
* clarify ER_CANT_DROP_FIELD_OR_KEYSergei Golubchik2016-07-0217-56/+54
* Post-commit text fix for embedded: 12d75e6121 - new thread stack sizeElena Stepanova2016-07-021-2/+2
* Post-commit test fixesElena Stepanova2016-07-0224-2428/+2427
* don't save vcol flags in frmSergei Golubchik2016-07-013-11/+6
* cannot use item->const_item() in open_table_from_share()Sergei Golubchik2016-07-012-2/+6
* increase stack size for labradorSergei Golubchik2016-07-011-1/+1
* Removing the "thd" argument from Item::create_field_for_create_select().Alexander Barkov2016-07-017-12/+11
* MDEV-8989 ORDER BY optimizer ignores equality propagationSergei Golubchik2016-07-013-9/+36
* Post-merge: Update test resultsNirbhay Choubey2016-06-309-15/+26
* Merge branch '10.1' into 10.2Sergei Golubchik2016-06-30993-14781/+58981
|\
| * update tests for 32bitSergei Golubchik2016-06-291-2/+2
| * valgrind.supp: fix a typoSergei Golubchik2016-06-291-0/+1
| * MDEV-10054 Secure login fails when CIPHER is requiredSergei Golubchik2016-06-283-0/+13
| * 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-2814-630/+844
| |\ \
| | * | - 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-2058-195/+17455
| | |\ \
| | * | | - 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-233-78/+153
| | * | | Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1Olivier Bertrand2016-05-225093-321325/+782186
| | |\ \ \
| | * | | | - 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-272-0/+641
| | * | | | - Add the JDBC table type compilation for CMAKE.Olivier Bertrand2016-04-272-55/+86
| * | | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-06-285-0/+76
| |\ \ \ \ \
| | * | | | | Fix memory leak in XtraDB.Nirbhay Choubey2016-06-273-2/+3
| | * | | | | Fix galera,wsrep tests.Nirbhay Choubey2016-06-264-0/+9
| | * | | | | Fix build failure.Nirbhay Choubey2016-06-241-1/+1
| | * | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2016-06-240-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-23116-977/+1645
| | | |\ \ \ \ \