Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | TokuDB fixes to compile in MariaDB10.0-tokudb-merge | Sergei Golubchik | 2016-02-17 | 8 | -39/+52 |
* | Merge branch 'merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-02-17 | 217 | -6135/+16641 |
|\ | |||||
| * | 5.6.28-76.1 | Sergei Golubchik | 2016-02-16 | 217 | -6149/+16614 |
* | | Merge branch 'merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-02-16 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | move mysql-test to storage/tokudb/, rename suites | Sergei Golubchik | 2016-02-16 | 1232 | -0/+0 |
* | | Merge branch 'connect/10.0' into 10.0 | Sergei Golubchik | 2016-02-16 | 27 | -2557/+2678 |
|\ \ | |||||
| * \ | Merge branch 'ob-10.0' into 10.0 | Olivier Bertrand | 2016-02-16 | 10 | -2490/+2520 |
| |\ \ | |||||
| | * | | - Fix to MDEV-9542 Connect was not handling NULLs in the answer | Olivier Bertrand | 2016-02-15 | 10 | -2490/+2520 |
| * | | | Merge branch 'ob-10.0' into 10.0 | Olivier Bertrand | 2016-01-25 | 8 | -17/+82 |
| |\ \ \ | | |/ / | |||||
| | * | | - Change SQL_NTS to 0 when the string is NULL | Olivier Bertrand | 2016-01-25 | 8 | -17/+82 |
| * | | | Merge branch 'ob-10.0' into 10.0 | Olivier Bertrand | 2016-01-10 | 8 | -42/+61 |
| |\ \ \ | | |/ / | |||||
| | * | | - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB Schema | Olivier Bertrand | 2016-01-09 | 8 | -42/+61 |
| * | | | Merge branch 'ob-10.0' into 10.0 | Olivier Bertrand | 2015-12-27 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | - Fix MDEV-9322. | Olivier Bertrand | 2015-12-27 | 1 | -2/+2 |
| * | | | Merge branch 'ob-10.0' into 10.0 | Olivier Bertrand | 2015-12-14 | 2 | -6/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | - Fix MDEV-9279. Replacing exit(1) in yy_fatal_error by a longjmp. | Olivier Bertrand | 2015-12-14 | 2 | -6/+13 |
* | | | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-02-16 | 2 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | 5.6.29 | Sergei Golubchik | 2016-02-16 | 3 | -4/+5 |
* | | | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-02-16 | 18 | -123/+447 |
|\ \ \ \ \ | |||||
| * | | | | | 5.6.28-76.1 | Sergei Golubchik | 2016-02-16 | 16 | -119/+447 |
* | | | | | | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2016-02-16 | 22 | -158/+705 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 5.6.29 | Sergei Golubchik | 2016-02-16 | 17 | -155/+437 |
* | | | | | | | Revert "MDEV-8696: Adding indexes on empty table is slow with large innodb_so... | Sergei Golubchik | 2016-02-16 | 19 | -297/+42 |
* | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 116 | -533/+2625 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix buffer overrun | Vladislav Vaintroub | 2016-02-15 | 1 | -1/+1 |
| * | | | | | | | more strict ipv6_ok check in mtr | Sergei Golubchik | 2016-02-15 | 1 | -1/+1 |
| * | | | | | | | fix my_gethwaddr() for solaris | Sergei Golubchik | 2016-02-15 | 1 | -1/+1 |
| * | | | | | | | dtrace in cmake | Sergei Golubchik | 2016-02-15 | 3 | -0/+6 |
| * | | | | | | | better inline check | Sergei Golubchik | 2016-02-15 | 2 | -17/+23 |
| * | | | | | | | compilation errors on sparc sun studio 10 | Sergei Golubchik | 2016-02-15 | 7 | -160/+162 |
| * | | | | | | | MDEV-9225 mysql_upgrade segfault due to missing /etc/my.cnf.d | Vicențiu Ciorbaru | 2016-02-14 | 1 | -1/+2 |
| * | | | | | | | Fix memory leak when failing to read config file | Vicențiu Ciorbaru | 2016-02-14 | 1 | -0/+1 |
| * | | | | | | | Errorneous PSI declaration line fixed. | Alexey Botchkov | 2016-02-12 | 1 | -3/+7 |
| * | | | | | | | MDEV-9371 select insert('a',2,1,'b') doesn't return expected 'a'mariadb-5.5.48 | Alexander Barkov | 2016-02-10 | 8 | -13/+13 |
| * | | | | | | | MDEV-7122: Assertion `0' failed in subselect_hash_sj_engine::init | Vicențiu Ciorbaru | 2016-02-10 | 3 | -14/+15 |
| * | | | | | | | MDEV-7765: Crash (Assertion `!table || (!table->write_set || bitmap_is_set(ta... | Oleksandr Byelkin | 2016-02-09 | 3 | -0/+39 |
| * | | | | | | | MDEV-7122: Assertion `0' failed in subselect_hash_sj_engine::init | Vicențiu Ciorbaru | 2016-02-09 | 8 | -0/+110 |
| * | | | | | | | Merge branch 'bb-5.5-serg' into 5.5 | Sergei Golubchik | 2016-02-09 | 55 | -300/+1028 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'merge-xtradb-5.5' into 5.5 | Sergei Golubchik | 2016-02-09 | 3 | -4/+18 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | 5.5.47-37.7 | Sergei Golubchik | 2016-02-09 | 3 | -3/+17 |
| | * | | | | | | | | Bug#19817021 | Sergei Golubchik | 2016-02-09 | 2 | -0/+18 |
| | * | | | | | | | | Bug#20691429 ASSERTION `CHILD_L' FAILED IN STORAGE/MYISAMMRG/HA_MYISAMMRG.CC:631 | Sergei Golubchik | 2016-02-09 | 2 | -0/+64 |
| | * | | | | | | | | cleanup: make assert more readable | Sergei Golubchik | 2016-02-09 | 1 | -2/+2 |
| | * | | | | | | | | Bug#21205695 DROP TABLE MAY CAUSE SLAVES TO BREAK | Sergei Golubchik | 2016-02-09 | 1 | -1/+1 |
| | * | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-02-09 | 49 | -295/+927 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | BUG#22530768 Innodb freeze running REPLACE statementsmysql-5.5.48 | Shaohua Wang | 2016-01-15 | 2 | -17/+21 |
| | | * | | | | | | | | Updated copyright year in user visible text | Bjorn Munch | 2016-01-11 | 3 | -5/+5 |
| | | * | | | | | | | | Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITM | Yashwant Sahu | 2016-01-11 | 1 | -5/+1 |
| | | * | | | | | | | | Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITM. | Yashwant Sahu | 2016-01-11 | 1 | -2/+2 |
| | | * | | | | | | | | Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITM | Yashwant Sahu | 2016-01-11 | 8 | -26/+230 |