diff options
| author | unknown <brian@avenger.(none)> | 2004-08-13 16:27:17 -0700 |
|---|---|---|
| committer | unknown <brian@avenger.(none)> | 2004-08-13 16:27:17 -0700 |
| commit | 2d8f4a61bf49613f326407af75ce6dd8badfe21c (patch) | |
| tree | 9620e1e05dda7035c2036a5b0c7f7c89faacb947 /sql/handler.h | |
| parent | a5a4ed90f59c24e213af46c96e27a7104bdff89a (diff) | |
| parent | ff5ade15bd2536cd15ba3fa3bfb8f325d83283fa (diff) | |
| download | mariadb-git-2d8f4a61bf49613f326407af75ce6dd8badfe21c.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/tina-4.1
acinclude.m4:
Auto merged
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
Auto merged
configure.in:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
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 3dd89a0c5d0..4bb1d66eef3 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -147,7 +147,7 @@ enum db_type DB_TYPE_MRG_ISAM, DB_TYPE_MYISAM, DB_TYPE_MRG_MYISAM, DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB, DB_TYPE_GEMINI, DB_TYPE_NDBCLUSTER, - DB_TYPE_EXAMPLE_DB, DB_TYPE_ARCHIVE_DB, + DB_TYPE_EXAMPLE_DB, DB_TYPE_ARCHIVE_DB, DB_TYPE_CSV_DB, DB_TYPE_DEFAULT // Must be last }; |