summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-01-1314-60/+137
|\
| * Fixed that --sorted-result in mysql-test-run also works for execMichael Widenius2012-01-091-16/+34
| * 5.2->5.3 mergeSergei Golubchik2011-12-122-3/+48
| |\
| | * 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-022-3/+48
| * | Merge with 5.2.Michael Widenius2011-12-1117-61/+127
| |\ \ | | |/
| | * Merge with 5.1Michael Widenius2011-11-301-3/+18
| | |\
| | | * Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-301-3/+18
| | * | Fix testcases:Vladislav Vaintroub2011-11-291-1/+1
| | * | Merge with MariaDB 5.1Michael Widenius2011-11-2417-58/+110
| | |\ \ | | | |/
| | | * Merge with MySQL 5.1.60Michael Widenius2011-11-233-8/+28
| | | |\
| | | | * Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.Tor Didriksen2011-11-011-1/+2
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2117-49/+80
| | | |\ \
| | | * | | Fix gcc 4.6 warnings about assigned but not used variables.unknown2011-10-271-1/+2
| * | | | | Added handler and temporary table usage to mytopMichael Widenius2011-12-031-0/+2
* | | | | | always use sql/sql_string.* files, never - client/sql_string.*Sergei Golubchik2011-12-153-1/+2
* | | | | | new configure option: NOT_FOR_DISTRIBUTIONSergei Golubchik2011-12-141-3/+2
* | | | | | move safemalloc out of dbug.Sergei Golubchik2011-12-126-31/+44
* | | | | | mergeVladislav Vaintroub2011-11-282-3/+3
|\ \ \ \ \ \
| * | | | | | compiler warnings/errorsSergei Golubchik2011-11-232-3/+3
* | | | | | | Fix build and packaging on Windows:Vladislav Vaintroub2011-11-261-1/+1
|/ / / / / /
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-223-9/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Compiler warning about assigned but not used variables fixed.unknown2011-10-181-1/+2
| * | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_eventsSergei Golubchik2011-09-231-6/+6
| * | | | | Added MariaDB executable comment syntax: /*M!##### */Michael Widenius2011-08-291-2/+2
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0318-98/+1421
|\ \ \ \ \ \
| * | | | | | 12956584 followup fix for mysqltestBjorn Munch2011-09-301-7/+4
| * | | | | | Merge of fix for bug#11758062 from mysql-5.1.Raghav Kapoor2011-09-281-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED Raghav Kapoor2011-09-281-1/+1
| | * | | | | merge from 5.1 mainBjorn Munch2011-09-261-2/+4
| | |\ \ \ \ \
| | | * \ \ \ \ Manual merge from mysql-5.1.Ramil Kalimullin2011-08-099-46/+29
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | merge 5.0-security => 5.1-securityTor Didriksen2011-07-151-2/+4
| | | |\ \ \ \ \
| | | | * | | | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-151-2/+4
| * | | | | | | | merge from 5.5 mainBjorn Munch2011-09-261-5/+15
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge from 5.5.16Daniel Fischer2011-09-211-5/+15
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | BUG#12929631 : Execute crashes with --verbose output (Windows) Chuck Bell2011-09-091-0/+2
| | | * | | | | | | | BUG#12929345 : Execution aborts without any messages (Windows only)Chuck Bell2011-09-071-2/+2
| | | * | | | | | | | BUG#12929345 : Execution aborts without any messages (Windows only)Chuck Bell2011-09-071-3/+10
| | | * | | | | | | | BUG#12929631 : Execute crashes with --verbose output (Windows) Chuck Bell2011-09-071-2/+3
| | | * | | | | | | | Cherry-picking WL#5710 from mysql-5.5 to mysql-5.5.16-release.Alexander Nozdrin2011-08-152-1/+1196
| * | | | | | | | | | upmerge 12793118,12912120Bjorn Munch2011-09-151-5/+22
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Bug #12793118 MYSQLTEST: --ERROR AND --DISABLE_ABORT_ON_ERROR DO NOT WORK FOR...Bjorn Munch2011-09-141-5/+22
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Bug #12956584 - MYSQLTEST: --ENABLE_X OR --DISABLE_X APPLYING ONLY TO NEXT C...Bjorn Munch2011-09-151-3/+6
| * | | | | | | | | Bug #12956584 MYSQLTEST: --ENABLE_X OR --DISABLE_X APPLYING ONLY TO NEXT COMM...Bjorn Munch2011-09-141-30/+102
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Bug #12793170 MYSQLTEST: PROVIDE ACCESS TO ERROR NAMES THROUGH NUMERICBjorn Munch2011-08-221-3/+3
| * | | | | | | | Bug #12793170 MYSQLTEST: PROVIDE ACCESS TO ERROR NAMES THROUGH NUMERIC CODES ...Bjorn Munch2011-08-221-9/+23
| * | | | | | | | WL#5710 : enable and disable pluginsChuck Bell2011-08-108-23/+15
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2011-07-228-23/+15
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Manual merge from mysql-5.0.Alexander Nozdrin2011-07-228-42/+27
| | | |\ \ \ \ \ \
| | | | * | | | | | For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENTAlexander Nozdrin2011-07-228-53/+36
| * | | | | | | | | WL#5710 : enable and disable pluginsChuck Bell2011-08-091-10/+48