diff options
author | jani@ua141d10.elisa.omakaista.fi <> | 2005-11-03 16:10:11 +0200 |
---|---|---|
committer | jani@ua141d10.elisa.omakaista.fi <> | 2005-11-03 16:10:11 +0200 |
commit | 0ee589b4d612f3b0a087a96620174f4a7b70022b (patch) | |
tree | 533bc3410929cad9d7bedd3ecdd6edd46725efa1 /sql/sql_delete.cc | |
parent | c88f0e9c198793c597d0281566fbbc6be2ab63db (diff) | |
download | mariadb-git-0ee589b4d612f3b0a087a96620174f4a7b70022b.tar.gz |
Changes in get_table_type() and mysql_frm_type(). The main problem was
that in mysql_rm_table_part2_with_lock() previously we needed to open
same file twice. Now once is enough.
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r-- | sql/sql_delete.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 83f50ba3ac5..429db7cbf49 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -830,7 +830,8 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) if (!dont_send_ok) { db_type table_type; - if ((table_type=get_table_type(thd, path)) == DB_TYPE_UNKNOWN) + mysql_frm_type(thd, path, &table_type); + if (table_type == DB_TYPE_UNKNOWN) { my_error(ER_NO_SUCH_TABLE, MYF(0), table_list->db, table_list->table_name); |