diff options
| author | unknown <igor@rurik.mysql.com> | 2003-08-26 15:14:13 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-08-26 15:14:13 -0700 |
| commit | 8ef37457ba170b423312bf079ab229a899529e6d (patch) | |
| tree | 378132b83ee612e66eeabde6e73c45ffea62ef28 /sql/sql_lex.h | |
| parent | f84aefc3daeef1134e79b7b16e8bf41c7943d745 (diff) | |
| download | mariadb-git-8ef37457ba170b423312bf079ab229a899529e6d.tar.gz | |
key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:
After merge fix
sql/sql_lex.cc:
After merge fix
sql/set_var.cc:
After merge fix
sql/sql_yacc.yy:
After merge fix
sql/sql_lex.h:
After merge fix
mysql-test/r/key_cache.result:
After merge fix
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 8f668d1be7d..eb1d0c4b3ff 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -437,8 +437,8 @@ public: ulong table_options, thr_lock_type flags= TL_UNLOCK, List<String> *use_index= 0, - List<String> *ignore_index= 0); - + List<String> *ignore_index= 0, + LEX_STRING *option= 0); TABLE_LIST* get_table_list(); List<Item>* get_item_list(); List<String>* get_use_index(); |