diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-09 19:16:15 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-09 19:16:15 -0600 |
| commit | 9a6a7bf5f694dae0b33e61301a17f7aa6fcd1b62 (patch) | |
| tree | ed06f905f1515a2117cc0c243c526264fccaac77 /sql/sql_lex.cc | |
| parent | 4bb40187438bdfb8b1d8b091399bd01e0e3425c1 (diff) | |
| parent | ebb3bd0f75ecb2b89e4fe07c693caa9e09c2ce3a (diff) | |
| download | mariadb-git-9a6a7bf5f694dae0b33e61301a17f7aa6fcd1b62.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
ltmain.sh:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 8f77931a05f..0e77757b13b 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->select->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; } |