diff options
| author | unknown <joerg@debian.(none)> | 2007-04-20 12:31:03 +0200 |
|---|---|---|
| committer | unknown <joerg@debian.(none)> | 2007-04-20 12:31:03 +0200 |
| commit | 24dcb3a16b659cff15792242e1cc7c565e5589cd (patch) | |
| tree | 47d004d52f842265cb7a96ee4b590f89e39585d0 /sql/sql_delete.cc | |
| parent | 4f3efddddd13c1e899a3907fca483ade618d4988 (diff) | |
| parent | cff41d16c3ffd28fa25fa44052dab1d973c2ed80 (diff) | |
| download | mariadb-git-24dcb3a16b659cff15792242e1cc7c565e5589cd.tar.gz | |
Merge debian.(none):/M50/mysql-5.0
into debian.(none):/M50/push-5.0
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 071acb57945..bccd4d4cafe 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -369,8 +369,6 @@ bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds) { Item *fake_conds= 0; SELECT_LEX *select_lex= &thd->lex->select_lex; - const char *operation = thd->lex->sql_command == SQLCOM_TRUNCATE ? - "TRUNCATE" : "DELETE"; DBUG_ENTER("mysql_prepare_delete"); List<Item> all_fields; @@ -385,14 +383,14 @@ bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds) DBUG_RETURN(TRUE); if (!table_list->updatable || check_key_in_view(thd, table_list)) { - my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, operation); + my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "DELETE"); DBUG_RETURN(TRUE); } { TABLE_LIST *duplicate; if ((duplicate= unique_table(thd, table_list, table_list->next_global, 0))) { - update_non_unique_table_error(table_list, operation, duplicate); + update_non_unique_table_error(table_list, "DELETE", duplicate); DBUG_RETURN(TRUE); } } @@ -897,8 +895,7 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) if (!dont_send_ok) { db_type table_type; - if (mysql_frm_type(thd, path, &table_type) == FRMTYPE_VIEW) - goto trunc_by_del; + mysql_frm_type(thd, path, &table_type); if (table_type == DB_TYPE_UNKNOWN) { my_error(ER_NO_SUCH_TABLE, MYF(0), |