summaryrefslogtreecommitdiff
path: root/client/mysqlslap.c
diff options
context:
space:
mode:
authorVenkata Sidagam <venkata.sidagam@oracle.com>2012-04-09 14:51:46 +0530
committerVenkata Sidagam <venkata.sidagam@oracle.com>2012-04-09 14:51:46 +0530
commit1fa5d5b83a59d28ba547a17f7957c2b670e21496 (patch)
tree6d0d09edfd82e4f1eb4b68e7969197bcf7322640 /client/mysqlslap.c
parentf3d5127f4d1c9cccf9f1ab74ef2fa290b33f234d (diff)
downloadmariadb-git-1fa5d5b83a59d28ba547a17f7957c2b670e21496.tar.gz
Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWS
This bug is a duplicate of Bug #31173, which was pushed to the mysql-trunk 5.6 on 4th Aug, 2010. This is just a back-port of the fix mysql-test/r/mysqlslap.result: A test added as part of the fix for Bug #59107 mysql-test/t/mysqlslap.test: A test added as part of the fix for Bug #59107
Diffstat (limited to 'client/mysqlslap.c')
-rw-r--r--client/mysqlslap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index bce3566c6d4..35c36806769 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -143,7 +143,8 @@ static my_bool opt_compress= FALSE, tty_password= FALSE,
const char *auto_generate_sql_type= "mixed";
static unsigned long connect_flags= CLIENT_MULTI_RESULTS |
- CLIENT_MULTI_STATEMENTS;
+ CLIENT_MULTI_STATEMENTS |
+ CLIENT_REMEMBER_OPTIONS;
static int verbose, delimiter_length;
static uint commit_rate;