Merge bk-internal:/home/bk/mysql-4.1

into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown 2005-02-22 13:14:49 -08:00
commit 62ff22ee28
45 changed files with 436 additions and 137 deletions

View file

@ -2816,8 +2816,8 @@ unsent_create_error:
TABLE *table= tables->table;
/* Skip first table, which is the table we are inserting in */
tables= (TABLE_LIST *)
lex->select_lex.table_list.first= (byte*) first_local_table->next;
lex->select_lex.table_list.first= (byte*) first_local_table->next;
tables= (TABLE_LIST *) lex->select_lex.table_list.first;
first_local_table->next= 0;
if (!(res= mysql_prepare_insert(thd, tables, first_local_table,