diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-02 13:47:27 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-02 13:47:27 +0300 |
| commit | 5f14434098bcf161a43e70357c352468bb8cc084 (patch) | |
| tree | 2de8a661d1cf4ab5cd66d8cf5c408ac8ad98e084 /sql/handler.cc | |
| parent | 50a0734f1b4d56752c11341faca047e1a6f56740 (diff) | |
| parent | 1ceee5ce0588154ce8ef5f3ab2a7471d7ee2a513 (diff) | |
| download | mariadb-git-5f14434098bcf161a43e70357c352468bb8cc084.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 5b5d6d4764c..94910b24622 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -78,7 +78,7 @@ enum db_type ha_checktype(enum db_type database_type) return(berkeley_skip ? DB_TYPE_MYISAM : database_type); #endif #ifdef HAVE_INNOBASE_DB - case DB_TYPE_INNOBASE: + case DB_TYPE_INNODB: return(innodb_skip ? DB_TYPE_MYISAM : database_type); #endif #ifdef HAVE_GEMINI_DB @@ -124,7 +124,7 @@ handler *get_new_handler(TABLE *table, enum db_type db_type) return new ha_berkeley(table); #endif #ifdef HAVE_INNOBASE_DB - case DB_TYPE_INNOBASE: + case DB_TYPE_INNODB: return new ha_innobase(table); #endif #ifdef HAVE_GEMINI_DB @@ -801,8 +801,10 @@ int handler::index_next_same(byte *buf, const byte *key, uint keylen) /* - The following is only needed if we would like to use the database - for internal temporary tables + This is called to delete all rows in a table + If the handler don't support this, then this function will + return HA_ERR_WRONG_COMMAND and MySQL will delete the rows one + by one. */ int handler::delete_all_rows() |