mirror of
https://github.com/MariaDB/server.git
synced 2026-04-29 19:55:32 +02:00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged sql/unireg.cc: Auto merged
This commit is contained in:
commit
5ac7f0b3e4
12 changed files with 95 additions and 38 deletions
|
|
@ -808,7 +808,7 @@ 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(path)) == DB_TYPE_UNKNOWN)
|
||||
if ((table_type=get_table_type(thd, path)) == DB_TYPE_UNKNOWN)
|
||||
{
|
||||
my_error(ER_NO_SUCH_TABLE, MYF(0),
|
||||
table_list->db, table_list->table_name);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue