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_lex.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_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index a78fef62657..20bda932f2f 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -121,7 +121,7 @@ void lex_init(void) state_map[(uchar)'*']= (uchar) STATE_END_LONG_COMMENT; state_map[(uchar)'@']= (uchar) STATE_USER_END; state_map[(uchar) '`']= (uchar) STATE_USER_VARIABLE_DELIMITER; - if (thd_startup_options & OPTION_ANSI_MODE) + if (opt_sql_mode & MODE_ANSI_QUOTES) { state_map[(uchar) '"'] = STATE_USER_VARIABLE_DELIMITER; } @@ -149,7 +149,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) lex->ftfunc_list.empty(); lex->convert_set=(lex->thd=thd)->convert_set; lex->yacc_yyss=lex->yacc_yyvs=0; - lex->ignore_space=test(thd->client_capabilities & CLIENT_IGNORE_SPACE); + lex->ignore_space=test(thd->sql_mode & MODE_IGNORE_SPACE); return lex; } |