diff options
author | lars/lthalmann@dl145j.mysql.com <> | 2007-03-29 13:49:10 +0200 |
---|---|---|
committer | lars/lthalmann@dl145j.mysql.com <> | 2007-03-29 13:49:10 +0200 |
commit | 771e05d6573f2c4adf51d41c1bf0fa2f87cd7758 (patch) | |
tree | 730579ccaa51f529c48e98733cf6fab5127e104e /sql/table.h | |
parent | 1b9c4358a8c53b6aff209e170ac75f5e0e4f903b (diff) | |
parent | 306af7f4bcd97c670d07e6b564bc8226d178bb40 (diff) | |
download | mariadb-git-771e05d6573f2c4adf51d41c1bf0fa2f87cd7758.tar.gz |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
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 aa053f207b3..6e435c9b3e3 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 }; |