diff options
| author | unknown <svoj@april.(none)> | 2006-04-06 16:44:26 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-04-06 16:44:26 +0500 |
| commit | cc0e156ecc7ae7453818d4117d21aedf3f9023e8 (patch) | |
| tree | 04db03cbd2e1057fbd6719c10e0431c6c97dc504 /sql/sql_delete.cc | |
| parent | 6de776f70afb52fd4e851f57b7165d13dfa5dc95 (diff) | |
| parent | b3dad934787dbdc0aba7ea6ab4559eb0e2880e25 (diff) | |
| download | mariadb-git-cc0e156ecc7ae7453818d4117d21aedf3f9023e8.tar.gz | |
Merge april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
into april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_delete.cc:
Manual merge
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 181b91781d7..804270992e5 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -916,8 +916,7 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) DBUG_RETURN(TRUE); } if (!ha_check_storage_engine_flag(ha_resolve_by_legacy_type(thd, table_type), - HTON_CAN_RECREATE) - || thd->lex->sphead) + HTON_CAN_RECREATE)) goto trunc_by_del; if (lock_and_wait_for_table_name(thd, table_list)) |