Commit 0572112d authored by unknown's avatar unknown
Browse files

merge 


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge (use new code)
parents 73fe243d 8ed5952a

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

sql/sql_parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -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:

  {