diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:10:11 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:10:11 +0200 |
| commit | 5af7ca80d98459b9c163328eaf8709abdf8c9883 (patch) | |
| tree | 533bc3410929cad9d7bedd3ecdd6edd46725efa1 /sql/sql_delete.cc | |
| parent | abd77bc56397c1522f2b729334f877f9806dafd2 (diff) | |
| download | mariadb-git-5af7ca80d98459b9c163328eaf8709abdf8c9883.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.
sql/mysql_priv.h:
Merged functions get_table_type() and mysql_frm_type() into one,
using the name from latter one.
sql/sql_base.cc:
Changed get_table_type() to mysql_frm_type()
sql/sql_delete.cc:
Changed get_table_type() to mysql_frm_type()
sql/sql_rename.cc:
Changed get_table_type() to mysql_frm_type()
sql/sql_show.cc:
Changed get_table_type() to mysql_frm_type()
sql/sql_table.cc:
Changed get_table_type() to mysql_frm_type()
sql/sql_view.cc:
Merged code from get_table_type() and mysql_frm_type() into the latter one.
sql/sql_view.h:
Function prototype changes.
sql/table.cc:
No longer needed.
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); |