diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:43:05 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:43:05 +0200 |
| commit | 4b63b4adc0dc2326fb586d6ace066af44ff374a4 (patch) | |
| tree | f94ddc1a213afc4561ed6cb318761890998bf895 /sql/sql_delete.cc | |
| parent | fa8dafe5bba7b4c72c1e0bbf10d7a9e10b4ebe8a (diff) | |
| parent | 5af7ca80d98459b9c163328eaf8709abdf8c9883 (diff) | |
| download | mariadb-git-4b63b4adc0dc2326fb586d6ace066af44ff374a4.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/table.cc:
Auto merged
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 24b11916bf1..983f0931ef9 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -833,7 +833,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); |