summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* A clean-up patch for Item_func_conv_charset (needed for MDEV-9181)Alexander Barkov2016-01-262-7/+9
* Merge branch '10.0' into 10.1Sergei Golubchik2016-01-2510-33/+89
|\
| * Merge branch 'tmp' into tmp-10.0Kristian Nielsen2016-01-154-10/+27
| |\
| * | Fixed bug in semi_sync replication tests.Monty2016-01-034-11/+12
| * | Cleanup of slave code:Monty2016-01-039-22/+77
* | | MDEV-9428 NO_AUTO_VALUE_ON_ZERO is ignored when a trigger before insert is de...Sergei Golubchik2016-01-251-1/+4
* | | MDEV-9273 ERROR 1819 on grant statment for existing userSergei Golubchik2016-01-251-4/+6
* | | cleanup: move all password validation logic into one functionSergei Golubchik2016-01-251-31/+33
* | | cleanup: LEX_USER::pwtext and LEX_USER::pwhashSergei Golubchik2016-01-253-49/+59
* | | cleanup: create LEX_USER::reset_auth()Sergei Golubchik2016-01-255-23/+15
* | | MDEV-8208 Sporadic SEGFAULT on startupSergei Golubchik2016-01-254-67/+16
* | | cleanup: wsrep helper to create a threadSergei Golubchik2016-01-251-7/+10
* | | MDEV-9457: Poor query plan chosen for ORDER BY query by a recent 10.1Sergei Petrunia2016-01-241-5/+16
* | | MDEV-9118 ANALYZE TABLE for Engine independent status fetchs blob/text column...Oleksandr Byelkin2016-01-222-6/+28
* | | After-merge fix.Kristian Nielsen2016-01-151-2/+1
* | | Merge branch 'tmp' into tmp-10.1Kristian Nielsen2016-01-154-10/+27
|\ \ \ | | |/ | |/|
| * | Fix error handling for GTID and domain-based parallel replicationKristian Nielsen2016-01-154-10/+27
* | | Merge remote-tracking branch 'origin/10.0' into 10.1Alexander Barkov2015-12-291-5/+5
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2015-12-291-5/+5
| |\ \
| | * | Moving Field_blob::store_length() back from protected to public,Alexander Barkov2015-12-291-5/+5
* | | | Merge remote-tracking branch 'origin/10.0' into 10.1Alexander Barkov2015-12-293-13/+36
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2015-12-293-13/+36
| |\ \ \ | | |/ /
| | * | MDEV-9319 ALTER from a bigger to a smaller blob type truncates too much dataAlexander Barkov2015-12-293-13/+36
* | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-12-232-8/+18
|\ \ \ \
| * | | | MDEV-9224: postfix - thd can be null in reload_acl_and_cache()mariadb-galera-10.0.23Nirbhay Choubey2015-12-231-1/+1
| * | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-12-221-8/+8
| |\ \ \ \
| | * | | | MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353mariadb-galera-5.5.47Nirbhay Choubey2015-12-221-8/+8
| * | | | | MDEV-9224 : Database lockup on flush in galeraNirbhay Choubey2015-12-221-0/+10
* | | | | | MDEV-9095 - [PATCH] systemd capability for --memlockSergey Vojtovich2015-12-221-10/+18
* | | | | | Merge branch '10.1' into bb-10.1-sergSergei Golubchik2015-12-222-6/+13
|\ \ \ \ \ \
| * | | | | | MDEV-7540 Information Schema SPATIAL_REF_SYS contents don't match the expecte...Alexey Botchkov2015-12-211-5/+12
| * | | | | | MDEV-8627: SHOW GRANTS does not work for a replicated roleVicențiu Ciorbaru2015-12-211-1/+1
* | | | | | | fix galera.lp1438990 testSergei Golubchik2015-12-221-2/+4
* | | | | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-228-4/+36
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-12-191-1/+11
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353Nirbhay Choubey2015-12-161-1/+11
| | * | | | | Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-1025-83/+209
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-1323-178/+393
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-1948-331/+830
| |\ \ \ \ \ \ \ \
| * | | | | | | | | MDEV-9162 : MariaDB Galera Cluster memory leak on async slave nodeNirbhay Choubey2015-12-144-3/+20
* | | | | | | | | | MDEV-8605 MariaDB not use DEFAULT value even when inserted NULL for NOT NULLA...Sergei Golubchik2015-12-2112-67/+250
* | | | | | | | | | cleanupSergei Golubchik2015-12-218-67/+43
* | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-2136-174/+177
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | MDEV-9088 Server crashes on shutdown after the second post of feedback reportSergei Golubchik2015-12-1911-25/+1
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in manymariadb-10.0.23Sergey Vojtovich2015-12-161-3/+0
| * | | | | | | | after-merge fix partitioning testsSergei Golubchik2015-12-151-0/+1
| * | | | | | | | MDEV-9147: Character set is ignored in Dynamic Column for saved stringOleksandr Byelkin2015-12-151-0/+2
| * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-1316-61/+62
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | MDEV-7655 SHOW CREATE TABLE returns invalid DDL when using virtual columns al...Sergei Golubchik2015-12-111-1/+1
| | * | | | | | | revert 5e9a50efc37c233f1e2a3616f8bcb36315aba4c2Sergei Golubchik2015-12-111-3/+1