summaryrefslogtreecommitdiff
path: root/sql/sql_cache.h
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_cache.h
parent0e007344eae972b9be7d88ca43373cb33662ac1c (diff)
parent11400de10cdfa9047904539fb9e7fbff611d9391 (diff)
downloadmariadb-git-6edd76785c2fff55f1869ef816da13a8bab6151d.tar.gz
merge
Diffstat (limited to 'sql/sql_cache.h')
-rw-r--r--sql/sql_cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index 36a05b49fa9..87b861b34f8 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -537,7 +537,7 @@ struct Query_cache_query_flags
uint collation_connection_num;
ha_rows limit;
Time_zone *time_zone;
- ulong sql_mode;
+ ulonglong sql_mode;
ulong max_sort_length;
ulong group_concat_max_len;
ulong default_week_format;