diff options
| author | Raghav Kapoor <raghav.kapoor@oracle.com> | 2011-09-28 15:39:21 +0530 |
|---|---|---|
| committer | Raghav Kapoor <raghav.kapoor@oracle.com> | 2011-09-28 15:39:21 +0530 |
| commit | 92d96d143751121e37fa69efd06ea4a877f3040d (patch) | |
| tree | bd293dc8e3870689153d1c248a1cfbb5c26d2ce8 /client | |
| parent | d8c68db1f19048558f96cda3c65170deb93c00f0 (diff) | |
| download | mariadb-git-92d96d143751121e37fa69efd06ea4a877f3040d.tar.gz | |
BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED
SYSTEM VARIABLE NAME SQL_MAX_JOIN_SI
BACKGROUND:
ER_TOO_BIG_SELECT refers to SQL_MAX_JOIN_SIZE, which is the
old name for MAX_JOIN_SIZE.
FIX:
Support for old name SQL_MAX_JOIN_SIZE is removed in MySQL 5.6
and is renamed as MAX_JOIN_SIZE.So the errmsg.txt
and mysql.cc files have been updated and the corresponding result
files have also been updated.
Diffstat (limited to 'client')
| -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 0a6b4da34b0..49d58a832a2 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -4290,7 +4290,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); } |