diff options
| author | unknown <guilhem@gbichot3.local> | 2007-03-22 16:00:47 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2007-03-22 16:00:47 +0100 |
| commit | c4e4bc323519d8e9ba1be8505c19d732f6ab8199 (patch) | |
| tree | 20114034d61c933b3e155630e00aa04bca4d81fb /sql/table.h | |
| parent | 89bfca83c925631e3366bd1b2dae229d2b2b4c29 (diff) | |
| parent | 685d21b72f201a2eb16718e73c76e62ee708458d (diff) | |
| download | mariadb-git-c4e4bc323519d8e9ba1be8505c19d732f6ab8199.tar.gz | |
Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl
into gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
will fix by hand
mysql-test/t/rpl_misc_functions.test:
Auto merged
sql/lock.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_select.cc:
will fix by hand
sql/table.h:
merge from 5.0
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 54c820d391c..8538177a1ee 100644 --- a/sql/table.h +++ b/sql/table.h @@ -58,7 +58,7 @@ typedef struct st_grant_info enum tmp_table_type { - NO_TMP_TABLE, TMP_TABLE, TRANSACTIONAL_TMP_TABLE, + NO_TMP_TABLE, NON_TRANSACTIONAL_TMP_TABLE, TRANSACTIONAL_TMP_TABLE, INTERNAL_TMP_TABLE, SYSTEM_TMP_TABLE }; |