summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-17 12:12:33 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-17 12:12:33 +0200
commit0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb (patch)
tree7e682617fcbdab399d2eafccb6a4800dfdc71e51 /client
parent97ae1682f185be05276b172919e47fd86e9fd953 (diff)
parentdf905524b218de07dddf5fa394af96edcc4ca483 (diff)
downloadmariadb-git-0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb.tar.gz
merge with mysql-5.1.63
Diffstat (limited to 'client')
-rw-r--r--client/mysqlslap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index cbd244d802b..d4a6766bfdc 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;