diff options
| author | unknown <sergefp@mysql.com> | 2005-03-15 04:09:41 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-03-15 04:09:41 +0300 |
| commit | 155cfb394280cc2501fda2bffcec7b73fd92582c (patch) | |
| tree | d1d0f3a9d3b2b337a002448565e55b435ff103a1 /sql/set_var.cc | |
| parent | 8ee298cc7502f2537d9899093b786a0955ba20f9 (diff) | |
| parent | c082848897de3421824d591ff9f8484c5a8d38c5 (diff) | |
| download | mariadb-git-155cfb394280cc2501fda2bffcec7b73fd92582c.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8510
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 02b53f701cc..257d0a92171 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -3105,8 +3105,14 @@ ulong fix_sql_mode(ulong sql_mode) */ if (sql_mode & MODE_ANSI) + { sql_mode|= (MODE_REAL_AS_FLOAT | MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES | - MODE_IGNORE_SPACE | MODE_ONLY_FULL_GROUP_BY); + MODE_IGNORE_SPACE); + /* + MODE_ONLY_FULL_GROUP_BY removed from ANSI mode because it is currently + overly restrictive (see BUG#8510). + */ + } if (sql_mode & MODE_ORACLE) sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES | MODE_IGNORE_SPACE | |