diff options
| author | unknown <monty@mysql.com> | 2004-08-26 00:39:43 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-08-26 00:39:43 +0300 |
| commit | 0572112d43acb60d60fa68f53b49ff12f610f1fc (patch) | |
| tree | e2754d3a230fc8c5f8728e8df5f64d1b8a4717a1 /sql | |
| parent | 73fe243d43067860295148ed6eac1f742d16de26 (diff) | |
| parent | 8ed5952a86b75f3c68faf3c039a59fbde51209f8 (diff) | |
| download | mariadb-git-0572112d43acb60d60fa68f53b49ff12f610f1fc.tar.gz | |
merge
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/mysql-test-run.sh:
merge (use new code)
Diffstat (limited to 'sql')
| -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: { |