diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-08-03 15:30:31 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-08-03 15:30:31 +0500 |
| commit | 0d1972aa72dd98a229a2a8c8faca46383bbcc572 (patch) | |
| tree | c657f898b9581b0e2a19433212ad42eca9646b98 /sql/sql_lex.h | |
| parent | 607ab14cf767ed0187e0c050ed61cb4ebaf34bb7 (diff) | |
| parent | 53df09a9a6a99b82e2a8869eb16737a78772b29e (diff) | |
| download | mariadb-git-0d1972aa72dd98a229a2a8c8faca46383bbcc572.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/conf_to_src.c:
Auto merged
strings/ctype-extra.c:
Auto merged
mysql-test/r/ctype_ucs.result:
After merge fix
mysql-test/t/ctype_ucs.test:
After merge fix
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index bfa6c05974f..b9c6abd2b06 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -957,6 +957,9 @@ public: /** Position of ';' in the stream, to delimit multiple queries. */ const char* found_semicolon; + + /** Token character bitmaps, to detect 7bit strings. */ + uchar tok_bitmap; /** SQL_MODE = IGNORE_SPACE. */ bool ignore_space; @@ -994,6 +997,7 @@ typedef struct st_lex : public Query_tables_list gptr yacc_yyss,yacc_yyvs; THD *thd; CHARSET_INFO *charset, *underscore_charset; + bool text_string_is_7bit; /* store original leaf_tables for INSERT SELECT and PS/SP */ TABLE_LIST *leaf_tables_insert; /* Position (first character index) of SELECT of CREATE VIEW statement */ |