diff options
| author | unknown <jani@hynda.mysql.fi> | 2001-08-09 18:51:38 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2001-08-09 18:51:38 +0300 |
| commit | b95d4398ff9c02f338f6b023481b0d8448070997 (patch) | |
| tree | fae4985713a526cf99cd5de3f34e3e2cc10f5463 /sql/sql_select.cc | |
| parent | b55459799789a7ffec4986aa58d70e78a73e687e (diff) | |
| download | mariadb-git-b95d4398ff9c02f338f6b023481b0d8448070997.tar.gz | |
Added new optino --sql-mode to mysqld.
Docs/manual.texi:
New option, --sql-mode=option[,option[,option]]
sql/ha_myisam.cc:
Fixed a segmentation fault -bug with myisam-recover which
occurred if option specified was not a legal one.
sql/mysql_priv.h:
New option --sql-mode
sql/mysqld.cc:
New option --sql-mode
sql/sql_class.cc:
New option --sql-mode
sql/sql_class.h:
New option --sql-mode
sql/sql_lex.cc:
option --sql-mode, ansi_quotes and ignore_space
sql/sql_parse.cc:
option --sql-mode, ignore_space
sql/sql_select.cc:
option --sql-mode, mode only_full_group_by
sql/sql_yacc.yy:
option --sql-mode, modes pipes_as_concat and real_as_float
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 00f92e56b71..5c3e7516eaf 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5937,7 +5937,7 @@ setup_group(THD *thd,TABLE_LIST *tables,List<Item> &fields, if (!order) return 0; /* Everything is ok */ - if (thd->options & OPTION_ANSI_MODE) + if (thd->sql_mode & MODE_ONLY_FULL_GROUP_BY) { Item *item; List_iterator<Item> li(fields); @@ -5959,7 +5959,7 @@ setup_group(THD *thd,TABLE_LIST *tables,List<Item> &fields, return 1; } } - if (thd->options & OPTION_ANSI_MODE) + if (thd->sql_mode & MODE_ONLY_FULL_GROUP_BY) { /* Don't allow one to use fields that is not used in GROUP BY */ Item *item; |