summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed compiler errorsMichael Widenius2012-08-1418-23/+64
* Automatic mergeMichael Widenius2012-08-1312-29/+139
|\
| * Fixed compiler warnings (A few of these was bugs)Michael Widenius2012-08-138-12/+14
| * Better test case for MDEV-436Michael Widenius2012-08-082-3/+52
| * Use less memory when growing HEAP tables. See MDEV-436Michael Widenius2012-08-074-17/+76
* | MDEV-336 oqgraph 5.5 crashes in buildbotSergei Golubchik2012-08-111-1/+1
* | compiler warningsSergei Golubchik2012-08-101-2/+2
* | fix val_str_ascii to return a string in the ascii-compatible charset.Sergei Golubchik2012-08-093-1/+13
* | merge with MySQL 5.5.27Sergei Golubchik2012-08-09122-1727/+2869
|\ \
| * | undo the fix for MySQL Bug#12998841Sergei Golubchik2012-08-0811-120/+14
| * | Empty version change upmergeBjorn Munch2012-07-110-0/+0
| |\ \
| | * | Raise version number after cloning 5.1.65unknown2012-07-111-1/+1
| * | | (no commit message)unknown2012-07-110-0/+0
| * | | (no commit message)unknown2012-07-110-0/+0
| * | | Bug #13444084:PRIMARY KEY OR UNIQUE KEY >453 BYTES FAILS FORChaithra Gopalareddy2012-07-111-3/+4
| * | | bug#11759333:Rohit Kalhans2012-07-101-16/+10
| * | | Bug#13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |HANDLE_FATAL_SIGNAL IN STRNLENMayank Prasad2012-07-101-2/+5
| * | | Bug#12623923 Server can crash after failure to createJon Olav Hauglid2012-07-103-19/+57
| * | | (no commit message)unknown2012-07-100-0/+0
| |\ \ \ | | |/ /
| | * | (no commit message)unknown2012-07-100-0/+0
| * | | BUG#11759333: SBR LOGGING WARNING MESSAGES FOR PRIMARYRohit Kalhans2012-07-101-5/+139
| * | | null-merge from 5.1.Andrei Elkin2012-07-100-0/+0
| |\ \ \ | | |/ /
| | * | merge from 5.1 repo.Andrei Elkin2012-07-101-0/+1
| | |\ \
| | * \ \ merge from 5.1 repo.Andrei Elkin2012-07-105-9/+41
| | |\ \ \
| | * \ \ \ merge from 5.1 repo.Andrei Elkin2012-07-107-1356/+1391
| | |\ \ \ \
| * | \ \ \ \ merge from 5.5 repo.Andrei Elkin2012-07-108-1405/+1465
| |\ \ \ \ \ \
| | * \ \ \ \ \ null upmergeBjorn Munch2012-07-100-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | mysql_client_fw.c was not included in make distBjorn Munch2012-07-101-0/+1
| | | | |_|/ / | | | |/| | |
| | * | | | | null upmergeBjorn Munch2012-07-100-0/+0
| | |\ \ \ \ \
| | | * | | | | mysql_client_fw.c was not included in make distBjorn Munch2012-07-101-0/+1
| | | | |_|/ / | | | |/| | |
| | * | | | | merge from 5.1 to 5.5Sujatha Sivakumar2012-07-105-9/+41
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | BUG#11762670:MY_B_WRITE RETURN VALUE IGNOREDSujatha Sivakumar2012-07-105-9/+41
| | | |/ / /
| | * | | | mysql_client_test did not build within limbysqld/examplesBjorn Munch2012-07-101-0/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | mysql_client_test did not build within limbysqld/examplesBjorn Munch2012-07-102-2/+4
| | * | | | Fixed compile error in mysql_client_test using gccBjorn Munch2012-07-091-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixed compile error in mysql_client_test using gccBjorn Munch2012-07-091-1/+1
| | * | | | Refactor mysql_client_test.c into a framework part and a test partBjorn Munch2012-07-092-1396/+1423
| | |\ \ \ \ | | | |/ / /
| | | * | | Refactor mysql_client_test.c into a framework part and a test partBjorn Munch2012-07-093-1353/+1381
| | * | | | (no commit message)unknown2012-07-060-0/+0
| * | | | | (no commit message)unknown2012-07-060-0/+0
| * | | | | merge from 5.5 repo.Andrei Elkin2012-07-065-3/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge from mysql-5.5.25a-releaseSunanda Menon2012-07-061-2/+2
| | |\ \ \ \
| | | * | | | Added some extra optional path to test suites.Joerg Bruehe2012-07-022-4/+8
| | | * | | | Fix mysql_plugin test to handle version XXaBjorn Munch2012-06-291-2/+2
| | | * | | | Bug#65745: UPDATE ON INNODB TABLE ENTERS RECURSIONJoerg Bruehe2012-06-282-1/+10
| | * | | | | Bug #12910665: AUTH-PLUGIN-DATA-LEN NOT TESTED FOR VALIDITY BY THE Georgi Kodinov2012-06-292-0/+7
| | * | | | | mergeGeorgi Kodinov2012-07-052-1/+6
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Bug #13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |Georgi Kodinov2012-07-052-1/+6
| * | | | | | merge bug14275000 fixes to 5.5: sql/log_event.h.Andrei Elkin2012-07-051-9/+1
| * | | | | | merge bug14275000 fixes to 5.5Andrei Elkin2012-07-052-5/+29
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
View Lorry Controller Status