summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* TokuDB fixes to compile in MariaDB10.0-tokudb-mergeSergei Golubchik2016-02-178-39/+52
* Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2016-02-17217-6135/+16641
|\
| * 5.6.28-76.1Sergei Golubchik2016-02-16217-6149/+16614
* | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2016-02-160-0/+0
|\ \ | |/
| * move mysql-test to storage/tokudb/, rename suitesSergei Golubchik2016-02-161232-0/+0
* | Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-02-1627-2557/+2678
|\ \
| * \ Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-02-1610-2490/+2520
| |\ \
| | * | - Fix to MDEV-9542 Connect was not handling NULLs in the answerOlivier Bertrand2016-02-1510-2490/+2520
| * | | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-01-258-17/+82
| |\ \ \ | | |/ /
| | * | - Change SQL_NTS to 0 when the string is NULLOlivier Bertrand2016-01-258-17/+82
| * | | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-01-108-42/+61
| |\ \ \ | | |/ /
| | * | - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB SchemaOlivier Bertrand2016-01-098-42/+61
| * | | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2015-12-271-2/+2
| |\ \ \ | | |/ /
| | * | - Fix MDEV-9322.Olivier Bertrand2015-12-271-2/+2
| * | | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2015-12-142-6/+13
| |\ \ \ | | |/ /
| | * | - Fix MDEV-9279. Replacing exit(1) in yy_fatal_error by a longjmp.Olivier Bertrand2015-12-142-6/+13
* | | | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2016-02-162-3/+4
|\ \ \ \
| * | | | 5.6.29Sergei Golubchik2016-02-163-4/+5
* | | | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-02-1618-123/+447
|\ \ \ \ \
| * | | | | 5.6.28-76.1Sergei Golubchik2016-02-1616-119/+447
* | | | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-02-1622-158/+705
|\ \ \ \ \ \
| * | | | | | 5.6.29Sergei Golubchik2016-02-1617-155/+437
* | | | | | | Revert "MDEV-8696: Adding indexes on empty table is slow with large innodb_so...Sergei Golubchik2016-02-1619-297/+42
* | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-15116-533/+2625
|\ \ \ \ \ \ \
| * | | | | | | fix buffer overrunVladislav Vaintroub2016-02-151-1/+1
| * | | | | | | more strict ipv6_ok check in mtrSergei Golubchik2016-02-151-1/+1
| * | | | | | | fix my_gethwaddr() for solarisSergei Golubchik2016-02-151-1/+1
| * | | | | | | dtrace in cmakeSergei Golubchik2016-02-153-0/+6
| * | | | | | | better inline checkSergei Golubchik2016-02-152-17/+23
| * | | | | | | compilation errors on sparc sun studio 10Sergei Golubchik2016-02-157-160/+162
| * | | | | | | MDEV-9225 mysql_upgrade segfault due to missing /etc/my.cnf.dVicențiu Ciorbaru2016-02-141-1/+2
| * | | | | | | Fix memory leak when failing to read config fileVicențiu Ciorbaru2016-02-141-0/+1
| * | | | | | | Errorneous PSI declaration line fixed.Alexey Botchkov2016-02-121-3/+7
| * | | | | | | MDEV-9371 select insert('a',2,1,'b') doesn't return expected 'a'mariadb-5.5.48Alexander Barkov2016-02-108-13/+13
| * | | | | | | MDEV-7122: Assertion `0' failed in subselect_hash_sj_engine::initVicențiu Ciorbaru2016-02-103-14/+15
| * | | | | | | MDEV-7765: Crash (Assertion `!table || (!table->write_set || bitmap_is_set(ta...Oleksandr Byelkin2016-02-093-0/+39
| * | | | | | | MDEV-7122: Assertion `0' failed in subselect_hash_sj_engine::initVicențiu Ciorbaru2016-02-098-0/+110
| * | | | | | | Merge branch 'bb-5.5-serg' into 5.5Sergei Golubchik2016-02-0955-300/+1028
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-02-093-4/+18
| | |\ \ \ \ \ \ \
| | | * | | | | | | 5.5.47-37.7Sergei Golubchik2016-02-093-3/+17
| | * | | | | | | | Bug#19817021Sergei Golubchik2016-02-092-0/+18
| | * | | | | | | | Bug#20691429 ASSERTION `CHILD_L' FAILED IN STORAGE/MYISAMMRG/HA_MYISAMMRG.CC:631Sergei Golubchik2016-02-092-0/+64
| | * | | | | | | | cleanup: make assert more readableSergei Golubchik2016-02-091-2/+2
| | * | | | | | | | Bug#21205695 DROP TABLE MAY CAUSE SLAVES TO BREAKSergei Golubchik2016-02-091-1/+1
| | * | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-0949-295/+927
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | BUG#22530768 Innodb freeze running REPLACE statementsmysql-5.5.48Shaohua Wang2016-01-152-17/+21
| | | * | | | | | | | Updated copyright year in user visible textBjorn Munch2016-01-113-5/+5
| | | * | | | | | | | Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITMYashwant Sahu2016-01-111-5/+1
| | | * | | | | | | | Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITM.Yashwant Sahu2016-01-111-2/+2
| | | * | | | | | | | Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITMYashwant Sahu2016-01-118-26/+230