Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 14 | -60/+137 |
|\ | |||||
| * | Fixed that --sorted-result in mysql-test-run also works for exec | Michael Widenius | 2012-01-09 | 1 | -16/+34 |
| * | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 2 | -3/+48 |
| |\ | |||||
| | * | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 2 | -3/+48 |
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 17 | -61/+127 |
| |\ \ | | |/ | |||||
| | * | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -3/+18 |
| | |\ | |||||
| | | * | Fixed compiler warnings and other bugs found by buildbot. | Michael Widenius | 2011-11-30 | 1 | -3/+18 |
| | * | | Fix testcases: | Vladislav Vaintroub | 2011-11-29 | 1 | -1/+1 |
| | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 17 | -58/+110 |
| | |\ \ | | | |/ | |||||
| | | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 3 | -8/+28 |
| | | |\ | |||||
| | | | * | Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build. | Tor Didriksen | 2011-11-01 | 1 | -1/+2 |
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 17 | -49/+80 |
| | | |\ \ | |||||
| | | * | | | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -1/+2 |
| * | | | | | Added handler and temporary table usage to mytop | Michael Widenius | 2011-12-03 | 1 | -0/+2 |
* | | | | | | always use sql/sql_string.* files, never - client/sql_string.* | Sergei Golubchik | 2011-12-15 | 3 | -1/+2 |
* | | | | | | new configure option: NOT_FOR_DISTRIBUTION | Sergei Golubchik | 2011-12-14 | 1 | -3/+2 |
* | | | | | | move safemalloc out of dbug. | Sergei Golubchik | 2011-12-12 | 6 | -31/+44 |
* | | | | | | merge | Vladislav Vaintroub | 2011-11-28 | 2 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | compiler warnings/errors | Sergei Golubchik | 2011-11-23 | 2 | -3/+3 |
* | | | | | | | Fix build and packaging on Windows: | Vladislav Vaintroub | 2011-11-26 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 3 | -9/+10 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -1/+2 |
| * | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -6/+6 |
| * | | | | | Added MariaDB executable comment syntax: /*M!##### */ | Michael Widenius | 2011-08-29 | 1 | -2/+2 |
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 18 | -98/+1421 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 12956584 followup fix for mysqltest | Bjorn Munch | 2011-09-30 | 1 | -7/+4 |
| * | | | | | | Merge of fix for bug#11758062 from mysql-5.1. | Raghav Kapoor | 2011-09-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED | Raghav Kapoor | 2011-09-28 | 1 | -1/+1 |
| | * | | | | | merge from 5.1 main | Bjorn Munch | 2011-09-26 | 1 | -2/+4 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Manual merge from mysql-5.1. | Ramil Kalimullin | 2011-08-09 | 9 | -46/+29 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | * | | | | | merge 5.0-security => 5.1-security | Tor Didriksen | 2011-07-15 | 1 | -2/+4 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REAL | Tor Didriksen | 2011-07-15 | 1 | -2/+4 |
| * | | | | | | | | merge from 5.5 main | Bjorn Munch | 2011-09-26 | 1 | -5/+15 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge from 5.5.16 | Daniel Fischer | 2011-09-21 | 1 | -5/+15 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | BUG#12929631 : Execute crashes with --verbose output (Windows) | Chuck Bell | 2011-09-09 | 1 | -0/+2 |
| | | * | | | | | | | | BUG#12929345 : Execution aborts without any messages (Windows only) | Chuck Bell | 2011-09-07 | 1 | -2/+2 |
| | | * | | | | | | | | BUG#12929345 : Execution aborts without any messages (Windows only) | Chuck Bell | 2011-09-07 | 1 | -3/+10 |
| | | * | | | | | | | | BUG#12929631 : Execute crashes with --verbose output (Windows) | Chuck Bell | 2011-09-07 | 1 | -2/+3 |
| | | * | | | | | | | | Cherry-picking WL#5710 from mysql-5.5 to mysql-5.5.16-release. | Alexander Nozdrin | 2011-08-15 | 2 | -1/+1196 |
| * | | | | | | | | | | 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 |
| * | | | | | | | | WL#5710 : enable and disable plugins | Chuck Bell | 2011-08-10 | 8 | -23/+15 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2011-07-22 | 8 | -23/+15 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Manual merge from mysql-5.0. | Alexander Nozdrin | 2011-07-22 | 8 | -42/+27 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT | Alexander Nozdrin | 2011-07-22 | 8 | -53/+36 |
| * | | | | | | | | | WL#5710 : enable and disable plugins | Chuck Bell | 2011-08-09 | 1 | -10/+48 |