diff options
| author | guilhem@gbichot3.local <> | 2007-03-22 16:00:47 +0100 |
|---|---|---|
| committer | guilhem@gbichot3.local <> | 2007-03-22 16:00:47 +0100 |
| commit | 6a4dbc332243ff01e940bfa8fa3b96e775325c4b (patch) | |
| tree | 20114034d61c933b3e155630e00aa04bca4d81fb /sql/table.h | |
| parent | f0936e94415e82104304634c88446fa10df2b1ca (diff) | |
| parent | f0a95a4e20e095ae27f3003bbcdc8d3eb2aa01d2 (diff) | |
| download | mariadb-git-6a4dbc332243ff01e940bfa8fa3b96e775325c4b.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
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 }; |