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_parse.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_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 87fbed47ef1..1c8c917babe 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -412,6 +412,8 @@ check_connections(THD *thd) return(ER_OUT_OF_RESOURCES); thd->client_capabilities=uint2korr(net->read_pos); + if (thd->client_capabilities & CLIENT_IGNORE_SPACE) + thd->sql_mode|= MODE_IGNORE_SPACE; #ifdef HAVE_OPENSSL DBUG_PRINT("info", ("pkt_len:%d, client capabilities: %d", @@ -538,8 +540,6 @@ pthread_handler_decl(handle_one_connection,arg) thd->options |= OPTION_BIG_SELECTS; if (thd->client_capabilities & CLIENT_COMPRESS) net->compress=1; // Use compression - if (thd->options & OPTION_ANSI_MODE) - thd->client_capabilities|=CLIENT_IGNORE_SPACE; thd->proc_info=0; // Remove 'login' thd->command=COM_SLEEP; |