Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 25 | -186/+452 |
|\ | |||||
| * | error messages: name the storage engine explicitly, | Sergei Golubchik | 2013-04-09 | 9 | -156/+156 |
| * | fix mysql_rm_table_no_locks() not to use dd_frm_type, because the frm file | Sergei Golubchik | 2013-04-09 | 1 | -3/+4 |
| * | * don't use 1-8 numbers for open_table_error codes, use an enum. | Sergei Golubchik | 2013-04-09 | 1 | -1/+1 |
| * | 5.5 merge | Sergei Golubchik | 2013-03-27 | 15 | -26/+282 |
| |\ | |||||
| | * | merge with XtraDB as of Percona-Server-5.5.30-rel30.1 | Sergei Golubchik | 2013-03-08 | 6 | -25/+0 |
| | * | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 12 | -8/+289 |
| | |\ | |||||
| | | * | Fix for Bug#14636211 WRONG RESULT (EXTRA ROW) ON A FROM SUBQUERY | Olav Sandstaa | 2013-01-15 | 1 | -3/+3 |
| | | * | Merging from mysql-5.1 to mysql-5.5. | Annamalai Gurusami | 2012-12-11 | 2 | -2/+2 |
| | | |\ | |||||
| | | * | | Bug#14147491 - INFINITE LOOP WHEN OPENING A CORRUPTED TABLE | Satya Bodapati | 2012-11-19 | 3 | -0/+93 |
| | | * | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2012-11-15 | 2 | -18/+0 |
| | | |\ \ | | | | |/ | |||||
| | | * | | Fix Bug #14753402 - FAILING ASSERTION: LEN == IFIELD->FIXED_LEN | Jimmy Yang | 2012-11-14 | 2 | -0/+18 |
| | | * | | Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT... | Yasufumi Kinoshita | 2012-11-12 | 2 | -0/+181 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT... | Yasufumi Kinoshita | 2012-11-12 | 2 | -0/+181 |
* | | | | | MDEV-4273 MYSQL_VERSION_MAJOR.MYSQL_VERSION_MINOR not replaced | Sergei Golubchik | 2013-04-03 | 2 | -0/+30 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 14 | -16/+241 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 20 | -18/+243 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | xtradb merge. Percona-Server-5.5.28-rel29.3 | Sergei Golubchik | 2013-01-16 | 4 | -8/+8 |
| | * | | | small cleanups | Sergei Golubchik | 2013-01-15 | 5 | -0/+0 |
| | * | | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 10 | -8/+85 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | merge from mysql-5.1 -> mysql-5.5 | Krunal Bauskar krunal.bauskar@oracle.com | 2012-10-17 | 2 | -0/+148 |
| | | |\ \ | | | | |/ | |||||
| | | * | | removing .... will re-add using merge. for some reason initial mysql-5.1 vers... | Krunal Bauskar krunal.bauskar@oracle.com | 2012-10-17 | 2 | -131/+0 |
| | | * | | removed warning message as they have changed in mysql-5.6 and mysql-trunk and... | Krunal Bauskar krunal.bauskar@oracle.com | 2012-10-15 | 2 | -3/+2 |
| | | * | | bug#14704286 | Krunal Bauskar krunal.bauskar@oracle.com | 2012-10-15 | 2 | -0/+132 |
| | | * | | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 2 | -7/+7 |
| | | * | | Merge from mysql-5.1 to mysql-5.5. | Annamalai Gurusami | 2012-09-03 | 2 | -1/+2 |
| | | |\ \ | |||||
| | | * \ \ | Merge from mysql-5.1 to mysql-5.5. | Annamalai Gurusami | 2012-09-01 | 4 | -6/+6 |
| | | |\ \ \ | | | | |/ / | |||||
| | | * | | | Bug#14145950 AUTO_INCREMENT ON DOUBLE WILL FAIL ON WINDOWS | Aditya A | 2012-08-27 | 2 | -2/+127 |
| | * | | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 2 | -0/+148 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 2 | -0/+148 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | 5.1 merge | Sergei Golubchik | 2013-01-10 | 2 | -0/+148 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 2 | -0/+148 |
| | | | | |\ \ \ \ | | | | | | | |_|/ | | | | | | |/| | | |||||
| | | | | | * | | | bug#14765606: ensure select is active before killing it else kill signal is i... | Krunal Bauskar krunal.bauskar@oracle.com | 2012-10-17 | 2 | -8/+24 |
| | | | | | * | | | bug#14704286 | Krunal Bauskar krunal.bauskar@oracle.com | 2012-10-15 | 2 | -0/+132 |
| | | | | | | |/ | | | | | | |/| | |||||
| | | * | | | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -1/+1 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -1/+1 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -1/+1 |
| | | | | |\ \ \ | | | | | | |/ / | |||||
| | * | | | | | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 2 | -2/+2 |
| | * | | | | | | MDEV-3883 Show global status not in order | Sergei Golubchik | 2013-01-08 | 1 | -8/+8 |
* | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 2 | -5/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | MDEV-532: Fix some race conditions in test cases. | unknown | 2012-12-17 | 1 | -0/+1 |
| * | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 3 | -5/+206 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | XtraDB from Percona-Server-5.5.28-rel29.1 | Sergei Golubchik | 2012-11-22 | 1 | -5/+0 |
* | | | | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 4 | -5/+214 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 3 | -5/+211 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Bug #13113026 INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRUFROM 5.6 BACKPORT | Annamalai Gurusami | 2012-07-25 | 2 | -0/+206 |
* | | | | | | | | add a forgotten debug sync point, that a test case was referring to | Sergei Golubchik | 2012-10-31 | 2 | -2/+2 |
* | | | | | | | | few fixes for test failures on windows | Sergei Golubchik | 2012-10-30 | 4 | -0/+0 |
* | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 19 | -77/+202 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Automatic merge | Michael Widenius | 2012-09-22 | 8 | -25/+120 |
| |\ \ \ \ \ \ \ |