diff options
| author | unknown <monty@mysql.com> | 2004-08-26 13:18:10 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-08-26 13:18:10 +0300 |
| commit | fe9b9d57cf4c1b7e9274e3fdc9df3a129904e9e5 (patch) | |
| tree | 63a8f053a30cae3960167f030777cd8131581f88 | |
| parent | a0dd3a30a51007a0952fd41f26acc0605205c7c7 (diff) | |
| parent | 0572112d43acb60d60fa68f53b49ff12f610f1fc (diff) | |
| download | mariadb-git-fe9b9d57cf4c1b7e9274e3fdc9df3a129904e9e5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
| -rw-r--r-- | sql/mysql_priv.h | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index f53e14878b0..d70be1cb9f9 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -477,7 +477,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields, void kill_delayed_threads(void); int mysql_delete(THD *thd, TABLE_LIST *table, COND *conds, ORDER *order, ha_rows rows, ulong options); -int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok=0); +int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok); TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update); TABLE *open_table(THD *thd,const char *db,const char *table,const char *alias, bool *refresh); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index f4887c6a8e6..14fc748c288 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2046,7 +2046,7 @@ mysql_execute_command(void) send_error(&thd->net,ER_LOCK_OR_ACTIVE_TRANSACTION,NullS); goto error; } - res=mysql_truncate(thd,tables); + res=mysql_truncate(thd, tables, 0); break; case SQLCOM_DELETE: { |