summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-03 23:39:53 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-03 23:39:53 +0100
commit6edd76785c2fff55f1869ef816da13a8bab6151d (patch)
treec987eb9a81d19b6544fc6688632bedd80f7622d1 /sql/sql_table.cc
parent0e007344eae972b9be7d88ca43373cb33662ac1c (diff)
parent11400de10cdfa9047904539fb9e7fbff611d9391 (diff)
downloadmariadb-git-6edd76785c2fff55f1869ef816da13a8bab6151d.tar.gz
merge
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 1b0279c9969..abd29ea6a02 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -7156,7 +7156,7 @@ copy_data_between_tables(THD *thd, TABLE *from,TABLE *to,
List<Item> all_fields;
ha_rows examined_rows;
bool auto_increment_field_copied= 0;
- ulong save_sql_mode= thd->variables.sql_mode;
+ ulonglong save_sql_mode= thd->variables.sql_mode;
ulonglong prev_insert_id, time_to_report_progress;
List_iterator<Create_field> it(create);
Create_field *def;