diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-23 19:32:14 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-23 19:32:14 +0200 |
| commit | 7b368e3810feda53fc0dbdf5bfe8863f82f0bbcc (patch) | |
| tree | bab573449ec11585c1b5149c7cbf477178caa469 /client/mysql.cc | |
| parent | c8768a091ac2d876216582813aaab7d9663008f7 (diff) | |
| parent | f28e7bd0645d478d33d7ae3b974931c7991cd0bd (diff) | |
| download | mariadb-git-7b368e3810feda53fc0dbdf5bfe8863f82f0bbcc.tar.gz | |
Merge with MySQL 5.1.60
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 26cbbc33c97..4d761945068 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -4325,7 +4325,7 @@ sql_real_connect(char *host,char *database,char *user,char *password, { char init_command[100]; sprintf(init_command, - "SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=%lu,SQL_MAX_JOIN_SIZE=%lu", + "SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=%lu,MAX_JOIN_SIZE=%lu", select_limit,max_join_size); mysql_options(&mysql, MYSQL_INIT_COMMAND, init_command); } |