diff options
| author | Raghav Kapoor <raghav.kapoor@oracle.com> | 2011-09-28 16:54:15 +0530 |
|---|---|---|
| committer | Raghav Kapoor <raghav.kapoor@oracle.com> | 2011-09-28 16:54:15 +0530 |
| commit | af400ee256fe94f6a4294041105ea83059c9c1bc (patch) | |
| tree | 60b76194c5bd110d815d964484b12ab49f94e97e /client/mysql.cc | |
| parent | ab21828e1d2dea646a4833963b49c0943b3ec756 (diff) | |
| parent | ffd0a785f4e235c5fc633467b793686a79cf5237 (diff) | |
| download | mariadb-git-af400ee256fe94f6a4294041105ea83059c9c1bc.tar.gz | |
Merge of fix for bug#11758062 from mysql-5.1.
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 db86a9b1a57..b6bc2f4b68f 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -4308,7 +4308,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); } |