diff options
| author | unknown <monty@donna.mysql.com> | 2000-10-20 17:40:13 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-10-20 17:40:13 +0300 |
| commit | 94c93b9ec7f68ba50219818caec23e61f85b800d (patch) | |
| tree | db3cf7c252d4ecb4845267a1731209451a2a92df /sql/handler.h | |
| parent | 23b8fccb93bd640bdd1b23af3afda15280e52485 (diff) | |
| parent | 982260d2cb5ec6b3864a34a4cb355160986f807f (diff) | |
| download | mariadb-git-94c93b9ec7f68ba50219818caec23e61f85b800d.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 269f60eec16..64d08204948 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -102,7 +102,7 @@ enum db_type { DB_TYPE_UNKNOWN=0,DB_TYPE_DIAB_ISAM=1, DB_TYPE_HASH,DB_TYPE_MISAM,DB_TYPE_PISAM, DB_TYPE_RMS_ISAM, DB_TYPE_HEAP, DB_TYPE_ISAM, DB_TYPE_MRG_ISAM, DB_TYPE_MYISAM, DB_TYPE_MRG_MYISAM, - DB_TYPE_BERKELEY_DB, + DB_TYPE_BERKELEY_DB, DB_TYPE_INNOBASE, DB_TYPE_DEFAULT }; enum row_type { ROW_TYPE_DEFAULT, ROW_TYPE_FIXED, ROW_TYPE_DYNAMIC, |