summaryrefslogtreecommitdiff
path: root/client/mysqlslap.c
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2014-02-031-0/+2
|\
| * Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-221-0/+2
* | Client attributesunknown2013-10-031-0/+3
* | merge 10.0-base -> 10.0unknown2013-09-261-1/+9
|\ \ | |/
| * MDEV-4684 - Enhancement request: --init-command support for mysqlslapSergey Vojtovich2013-09-171-1/+9
* | merge with 5.5Sergei Golubchik2012-11-031-2/+2
|\ \ | |/
| * mysql-5.5.28Sergei Golubchik2012-10-161-2/+2
| |\
| | * Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-071-2/+2
| | |\
| | | * Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-3/+3
| | | * Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWSVenkata Sidagam2012-04-091-1/+2
| | * | Bug #12998841: libmysql divulges plaintext password upon request in 5.5Georgi Kodinov2012-07-051-0/+12
* | | | fixes for test failuresSergei Golubchik2012-09-271-1/+1
* | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-1/+5
|/ / /
* | | cSergei Golubchik2012-05-211-1/+2
|\ \ \ | |/ /
| * | Merged from 5.1 to 5.5Venkata Sidagam2012-04-091-1/+2
| |\ \
| | * | Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWSVenkata Sidagam2012-04-091-1/+2
| | |/
* | | MDEV-186 Client programs throw warnings about memory loss when executed with ...Sergei Golubchik2012-03-231-0/+2
* | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \
| * \ \ Merge with 5.2.Michael Widenius2011-12-111-2/+3
| |\ \ \
| | * \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+3
| | |\ \ \
| | | * \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+3
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Updated/added copyright headersKent Boortz2011-07-031-3/+8
| | | | |\ \
* | | | | \ \ mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-9/+10
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | fix warningsVladislav Vaintroub2011-06-131-8/+8
| * | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr...Vladislav Vaintroub2011-06-121-1/+1
| | |_|/ / / | |/| | | |
| * | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-11/+19
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-11/+19
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm...Michael Widenius2011-03-181-1/+2
| |/ / / /
* | | | | fix memory leaks and other problems found by safemallocSergei Golubchik2011-07-101-0/+1
* | | | | 5.5-mergeSergei Golubchik2011-07-021-20/+37
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fixed cast warnings in introducing the pluggable authentication clientGeorgi Kodinov2011-06-061-2/+2
| * | | | Merging patch for bug#11765157 from mysql-5.1.Nirbhay Choubey2011-04-081-3/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug#11765157 - 58090: mysqlslap drops schema specified inNirbhay Choubey2011-04-081-3/+8
| | | |/ | | |/|
| * | | Bug#58139 : default-auth option not recognized in MySQL standardNirbhay Choubey2011-01-161-0/+14
| * | | Merging from mysql-5.1.Nirbhay Choubey2011-01-131-5/+15
| |\ \ \ | | |/ /
| | * | Bug#59109 : mysqlslap crashes on mysql_fetch_row after ignoringNirbhay Choubey2011-01-131-5/+15
| * | | Fix for Bug#57094 (Copyright notice incorrect?).Alexander Nozdrin2010-10-061-9/+4
* | | | merge.Sergei Golubchik2010-11-251-63/+107
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | This patch fixes LP#613408 Memory corruption with (M)aria storage engine and...Michael Widenius2010-08-071-1/+1
| * | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar...Michael Widenius2010-08-061-6/+6
| * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-58/+55
| |\ \ | | |/
| * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-6/+6
| |\ \
| * | | Patch set contributed by Alex Budovski (MCA)Michael Widenius2010-01-291-15/+22
| * | | MergeMichael Widenius2009-12-031-10/+8
| |\ \ \
| | * \ \ Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable...Michael Widenius2009-12-031-10/+8
| | |\ \ \
| | | * \ \ Merge with MySQL 5.1, with following additions:Michael Widenius2009-11-111-5/+11
| | | |\ \ \
| * | | \ \ \ Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-5/+11
| |\ \ \ \ \ \ | | |/ / / / /