Skip to content

M
mariadb
Commit 91ec38a7 authored by monty@mysql.com's avatar monty@mysql.com
Browse files
Options

merge

parents 852181a2 4fccf1c4
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/mysql_priv.h
View file @ 91ec38a7
...@@ -477,7 +477,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields, ...@@ -477,7 +477,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields,
void kill_delayed_threads(void); void kill_delayed_threads(void);
int mysql_delete(THD *thd, TABLE_LIST *table, COND *conds, ORDER *order, int mysql_delete(THD *thd, TABLE_LIST *table, COND *conds, ORDER *order,
ha_rows rows, ulong options); 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_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, TABLE *open_table(THD *thd,const char *db,const char *table,const char *alias,
bool *refresh); bool *refresh);
......
sql/sql_parse.cc
View file @ 91ec38a7
...@@ -2046,7 +2046,7 @@ mysql_execute_command(void) ...@@ -2046,7 +2046,7 @@ mysql_execute_command(void)
send_error(&thd->net,ER_LOCK_OR_ACTIVE_TRANSACTION,NullS); send_error(&thd->net,ER_LOCK_OR_ACTIVE_TRANSACTION,NullS);
goto error; goto error;
} }
res=mysql_truncate(thd,tables); res=mysql_truncate(thd, tables, 0);
break; break;
case SQLCOM_DELETE: case SQLCOM_DELETE:
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7