diff options
| author | unknown <jimw@mysql.com> | 2005-08-19 11:40:39 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-19 11:40:39 -0700 |
| commit | a2ae2a1f52a5acb4427b59da25e10b39fdd78c19 (patch) | |
| tree | 81a34dbfe3c99fa5d18c6d72fcdb62989e6b9596 /sql/table.h | |
| parent | 1a6a2322ef50ab44cd93c41c9e44d1945044fe57 (diff) | |
| parent | f7ce8954f697a1bae5f9b59fb02d6160264959bc (diff) | |
| download | mariadb-git-a2ae2a1f52a5acb4427b59da25e10b39fdd78c19.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-11711
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/information_schema.result:
Resolve conflicts
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index c0e4ad4c150..5bbf5746058 100644 --- a/sql/table.h +++ b/sql/table.h @@ -49,7 +49,8 @@ typedef struct st_grant_info ulong want_privilege; } GRANT_INFO; -enum tmp_table_type {NO_TMP_TABLE=0, TMP_TABLE=1, TRANSACTIONAL_TMP_TABLE=2}; +enum tmp_table_type {NO_TMP_TABLE=0, TMP_TABLE=1, TRANSACTIONAL_TMP_TABLE=2, + SYSTEM_TMP_TABLE=3}; enum frm_type_enum { |