diff options
| author | unknown <serg@serg.mylan> | 2005-02-17 14:00:44 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-17 14:00:44 +0100 |
| commit | 7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88 (patch) | |
| tree | 2286825455d6ff56f96a8bcd52bbb6737ebcd354 /sql/sql_lex.cc | |
| parent | d6541adb37068d6545fd6f871e4dd63fa8b1e90a (diff) | |
| parent | c5c497164fbc48bcc50770ced833a07788082aaf (diff) | |
| download | mariadb-git-7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/sql_yacc.yy:
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 08cf4402b74..a1f0413127d 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -141,7 +141,7 @@ void lex_start(THD *thd, uchar *buf,uint length) lex->view_prepare_mode= FALSE; lex->derived_tables= 0; lex->lock_option= TL_READ; - lex->found_colon= 0; + lex->found_semicolon= 0; lex->safe_to_cache_query= 1; lex->time_zone_tables_used= 0; lex->leaf_tables_insert= lex->proc_table= lex->query_tables= 0; @@ -949,7 +949,7 @@ int yylex(void *arg, void *yythd) (thd->command != COM_PREPARE)) { lex->safe_to_cache_query= 0; - lex->found_colon= (char*) lex->ptr; + lex->found_semicolon=(char*) lex->ptr; thd->server_status|= SERVER_MORE_RESULTS_EXISTS; lex->next_state= MY_LEX_END; return (END_OF_INPUT); |