mirror of
https://github.com/MariaDB/server.git
synced 2026-04-27 18:55:31 +02:00
Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1 mysql-test/r/view.result: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/view.test: Auto merged sql/item.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged
This commit is contained in:
commit
33b73c200f
68 changed files with 2648 additions and 432 deletions
|
|
@ -6712,7 +6712,7 @@ copy_data_between_tables(TABLE *from,TABLE *to,
|
|||
Copy_field *copy,*copy_end;
|
||||
ulong found_count,delete_count;
|
||||
THD *thd= current_thd;
|
||||
uint length;
|
||||
uint length= 0;
|
||||
SORT_FIELD *sortorder;
|
||||
READ_RECORD info;
|
||||
TABLE_LIST tables;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue