diff options
| author | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-09-04 18:45:48 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-09-04 18:45:48 +0300 |
| commit | 18ed9144bb38b0d9936cf8537a42e56f4af6b939 (patch) | |
| tree | 8a2db1f4c86eeb87afa5bee8f3be3722a9e263dc /sql/mysql_priv.h | |
| parent | efa8e33075d13f4a96f8d4659134f905e71a9f1a (diff) | |
| parent | 1431966d029ffd710c678080bee9e1d884205127 (diff) | |
| download | mariadb-git-18ed9144bb38b0d9936cf8537a42e56f4af6b939.tar.gz | |
Merge macbook.gmz:/Users/kgeorge/mysql/work/B21392-4.1-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B21392-5.0-opt
mysql-test/t/delete.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/delete.result:
merge 4.1->5.0
sql/sql_parse.cc:
merge 4.1->5.0
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 3178569abc6..620992b8cc7 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -425,6 +425,7 @@ void view_store_options(THD *thd, st_table_list *table, String *buff); #define TL_OPTION_UPDATING 1 #define TL_OPTION_FORCE_INDEX 2 #define TL_OPTION_IGNORE_LEAVES 4 +#define TL_OPTION_ALIAS 8 /* Some portable defines */ |