Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -9/+13 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -1/+2 | |
* | | | | | | | | move safemalloc out of dbug. | Sergei Golubchik | 2011-12-12 | 1 | -0/+4 | |
* | | | | | | | | compiler warnings/errors | Sergei Golubchik | 2011-11-23 | 1 | -2/+2 | |
* | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -1/+2 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -53/+151 | |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | 12956584 followup fix for mysqltest | Bjorn Munch | 2011-09-30 | 1 | -7/+4 | |
| * | | | | | | upmerge 12793118,12912120 | Bjorn Munch | 2011-09-15 | 1 | -5/+22 | |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| | * | | | | | Bug #12793118 MYSQLTEST: --ERROR AND --DISABLE_ABORT_ON_ERROR DO NOT WORK FOR... | Bjorn Munch | 2011-09-14 | 1 | -5/+22 | |
| | | |_|_|/ | | |/| | | | ||||||
| * | | | | | Bug #12956584 - MYSQLTEST: --ENABLE_X OR --DISABLE_X APPLYING ONLY TO NEXT C... | Bjorn Munch | 2011-09-15 | 1 | -3/+6 | |
| * | | | | | Bug #12956584 MYSQLTEST: --ENABLE_X OR --DISABLE_X APPLYING ONLY TO NEXT COMM... | Bjorn Munch | 2011-09-14 | 1 | -30/+102 | |
| * | | | | | Bug #12793170 MYSQLTEST: PROVIDE ACCESS TO ERROR NAMES THROUGH NUMERIC | Bjorn Munch | 2011-08-22 | 1 | -3/+3 | |
| * | | | | | Bug #12793170 MYSQLTEST: PROVIDE ACCESS TO ERROR NAMES THROUGH NUMERIC CODES ... | Bjorn Munch | 2011-08-22 | 1 | -9/+23 | |
| * | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2011-07-22 | 1 | -8/+1 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Manual merge from mysql-5.0. | Alexander Nozdrin | 2011-07-22 | 1 | -9/+3 | |
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -10/+14 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 | |
* | | | | | | | cleanups | Sergei Golubchik | 2011-10-19 | 1 | -4/+1 | |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -90/+157 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -2/+3 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | many changes to my_getsystime.c: | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 | |
| | * | | | | | | missing DBUG_RETURN | Sergei Golubchik | 2011-02-23 | 1 | -1/+2 | |
| * | | | | | | | automatic merge | unknown | 2011-05-18 | 1 | -1/+14 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -1/+14 | |
| * | | | | | | | | automerge | unknown | 2011-05-18 | 1 | -3/+8 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | | | ||||||
| | * | | | | | | automerge | unknown | 2011-05-18 | 1 | -3/+8 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Fix mysqltest printing of include stack. | unknown | 2011-05-18 | 1 | -3/+8 | |
| * | | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -2/+6 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Fixed bug when accessing wrong decimal value in dynamic string (Fixed lp:781233) | Michael Widenius | 2011-05-12 | 1 | -2/+6 | |
| * | | | | | | | mysqltest: Write command to be executed to the log BEFORE executing the command. | Michael Widenius | 2011-05-09 | 1 | -1/+19 | |
| * | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -18/+34 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | ||||||
| | * | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -18/+34 | |
| | |\ \ \ \ \ | ||||||
| * | | | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+2 | |
| * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -106/+201 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed... | Michael Widenius | 2011-02-24 | 1 | -71/+97 | |
| | * | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -31/+100 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Better fix for mysql_test.cc::do_remove_files_wildcard | Michael Widenius | 2011-01-26 | 1 | -3/+4 | |
| | * | | | | | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -2/+1 | |
| * | | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -16/+90 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -8/+13 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -8/+77 | |
| | |\ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | fix memory leaks and other problems found by safemalloc | Sergei Golubchik | 2011-07-10 | 1 | -0/+9 | |
* | | | | | | | | | | | add safemalloc back | Sergei Golubchik | 2011-07-10 | 1 | -0/+3 | |
* | | | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -89/+364 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Fixed cast warnings in introducing the pluggable authentication client | Georgi Kodinov | 2011-06-06 | 1 | -1/+1 | |
| * | | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 1 | -2/+2 | |
| * | | | | | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb. | Marko Mäkelä | 2011-04-11 | 1 | -5/+7 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Bug #11766513 - 59641: Prepared XA transaction in system after hard crash | Marko Mäkelä | 2011-04-07 | 1 | -5/+7 | |
| | | |_|_|_|_|/ / / | | |/| | | | | | | |