diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
commit | 6edd76785c2fff55f1869ef816da13a8bab6151d (patch) | |
tree | c987eb9a81d19b6544fc6688632bedd80f7622d1 /sql/sql_insert.cc | |
parent | 0e007344eae972b9be7d88ca43373cb33662ac1c (diff) | |
parent | 11400de10cdfa9047904539fb9e7fbff611d9391 (diff) | |
download | mariadb-git-6edd76785c2fff55f1869ef816da13a8bab6151d.tar.gz |
merge
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index b6ab3e4a7ff..f8327ccee04 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1877,7 +1877,7 @@ public: enum_duplicates dup; my_time_t start_time; ulong start_time_sec_part; - ulong sql_mode; + ulonglong sql_mode; bool auto_increment_field_not_null; bool query_start_used, ignore, log_query, query_start_sec_part_used; bool stmt_depends_on_first_successful_insert_id_in_prev_stmt; |