Use sql_mode_t for sql_mode.

montywi · montywi · commit 7b96416f3c43 · 2016-10-05T01:11:08.000+03:00
This fixed several cases where we where using just ulong for sql_mode
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
@@ -37,13 +37,12 @@
 #include <sslopt-vars.h>
 /* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */
 #include "sql_priv.h"
+#include "sql_basic_types.h"
 #include "log_event.h"
 #include "compat56.h"
 #include "sql_common.h"
 #include "my_dir.h"
 #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
-
-
 #include "sql_string.h"   // needed for Rpl_filter
 #include "sql_list.h"     // needed for Rpl_filter
 #include "rpl_filter.h"
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc
@@ -18,6 +18,7 @@
 
 #ifdef HAVE_QUERY_CACHE
 #include <mysql.h>
+#include "sql_basic_types.h"
 #include "emb_qcache.h"
 #include "embedded_priv.h"
 #include "sql_class.h"                          // THD
diff --git a/plugin/qc_info/qc_info.cc b/plugin/qc_info/qc_info.cc
@@ -32,10 +32,11 @@
 #define MYSQL_SERVER
 #endif
 
-#include <sql_cache.h>
+#include <my_global.h>
 #include <sql_parse.h>          // check_global_access
 #include <sql_acl.h>            // PROCESS_ACL
 #include <sql_class.h>          // THD
+#include <sql_cache.h>
 #include <table.h>              // ST_SCHEMA_TABLE
 #include <set_var.h>            // sql_mode_string_representation
 #include <tztime.h>
diff --git a/sql/event_data_objects.h b/sql/event_data_objects.h
@@ -132,7 +132,7 @@ class Event_timed : public Event_queue_element
   ulonglong created;
   ulonglong modified;
 
-  ulong sql_mode;
+  sql_mode_t sql_mode;
 
   class Stored_program_creation_ctx *creation_ctx;
   LEX_STRING body_utf8;
@@ -158,7 +158,7 @@ class Event_job_data : public Event_basic
   LEX_STRING definer_user;
   LEX_STRING definer_host;
 
-  ulong sql_mode;
+  sql_mode_t sql_mode;
 
   class Stored_program_creation_ctx *creation_ctx;
 
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc
@@ -202,7 +202,7 @@ mysql_event_fill_row(THD *thd,
                      TABLE *table,
                      Event_parse_data *et,
                      sp_head *sp,
-                     ulonglong sql_mode,
+                     sql_mode_t sql_mode,
                      my_bool is_update)
 {
   CHARSET_INFO *scs= system_charset_info;
@@ -658,7 +658,7 @@ Event_db_repository::create_event(THD *thd, Event_parse_data *parse_data,
   int ret= 1;
   TABLE *table= NULL;
   sp_head *sp= thd->lex->sphead;
-  ulonglong saved_mode= thd->variables.sql_mode;
+  sql_mode_t saved_mode= thd->variables.sql_mode;
   /*
     Take a savepoint to release only the lock on mysql.event
     table at the end but keep the global read lock and
@@ -787,7 +787,7 @@ Event_db_repository::update_event(THD *thd, Event_parse_data *parse_data,
   CHARSET_INFO *scs= system_charset_info;
   TABLE *table= NULL;
   sp_head *sp= thd->lex->sphead;
-  ulonglong saved_mode= thd->variables.sql_mode;
+  sql_mode_t saved_mode= thd->variables.sql_mode;
   /*
     Take a savepoint to release only the lock on mysql.event
     table at the end but keep the global read lock and
diff --git a/sql/handler.h b/sql/handler.h
@@ -25,7 +25,9 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
+#include <my_global.h>                          /* For handlers */
 #include "sql_const.h"
+#include "sql_basic_types.h"
 #include "mysqld.h"                             /* server_id */
 #include "sql_plugin.h"        /* plugin_ref, st_plugin_int, plugin */
 #include "thr_lock.h"          /* thr_lock_type, THR_LOCK_DATA */
diff --git a/sql/item.cc b/sql/item.cc
@@ -1388,7 +1388,7 @@ int Item::save_in_field_no_warnings(Field *field, bool no_conversions)
   THD *thd= table->in_use;
   enum_check_fields tmp= thd->count_cuted_fields;
   my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
-  ulonglong sql_mode= thd->variables.sql_mode;
+  sql_mode_t sql_mode= thd->variables.sql_mode;
   thd->variables.sql_mode&= ~(MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE);
   thd->variables.sql_mode|= MODE_INVALID_DATES;
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
@@ -413,7 +413,7 @@ static bool convert_const_to_int(THD *thd, Item_field *field_item,
   if ((*item)->const_item() && !(*item)->is_expensive())
   {
     TABLE *table= field->table;
-    ulonglong orig_sql_mode= thd->variables.sql_mode;
+    sql_mode_t orig_sql_mode= thd->variables.sql_mode;
     enum_check_fields orig_count_cuted_fields= thd->count_cuted_fields;
     my_bitmap_map *old_maps[2];
     ulonglong UNINIT_VAR(orig_field_val); /* original field value if valid */
diff --git a/sql/item_create.cc b/sql/item_create.cc
@@ -6279,7 +6279,7 @@ Item *create_temporal_literal(THD *thd,
   MYSQL_TIME_STATUS status;
   MYSQL_TIME ltime;
   Item *item= NULL;
-  ulonglong flags= sql_mode_for_dates(thd);
+  sql_mode_t flags= sql_mode_for_dates(thd);
 
   switch(type)
   {
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
@@ -529,7 +529,7 @@ class Item_func_time_to_sec :public Item_func_seconds_hybrid
 
 class Item_temporal_func: public Item_func
 {
-  ulonglong sql_mode;
+  sql_mode_t sql_mode;
 public:
   Item_temporal_func(THD *thd): Item_func(thd) {}
   Item_temporal_func(THD *thd, Item *a): Item_func(thd, a) {}
diff --git a/sql/log_event.cc b/sql/log_event.cc
@@ -3591,7 +3591,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
     {
       CHECK_SPACE(pos, end, 8);
       sql_mode_inited= 1;
-      sql_mode= (ulong) uint8korr(pos); // QQ: Fix when sql_mode is ulonglong
+      sql_mode= (sql_mode_t) uint8korr(pos);
       DBUG_PRINT("info",("In Query_log_event, read sql_mode: %llu", sql_mode));
       pos+= 8;
       break;
@@ -4073,8 +4073,9 @@ void Query_log_event::print_query_header(IO_CACHE* file,
       (unlikely(print_event_info->sql_mode != sql_mode ||
                 !print_event_info->sql_mode_inited)))
   {
-    my_b_printf(file,"SET @@session.sql_mode=%lu%s\n",
-                (ulong)sql_mode, print_event_info->delimiter);
+    char llbuff[22];
+    my_b_printf(file,"SET @@session.sql_mode=%s%s\n",
+                ullstr(sql_mode, llbuff), print_event_info->delimiter);
     print_event_info->sql_mode= sql_mode;
     print_event_info->sql_mode_inited= 1;
   }
@@ -4304,8 +4305,8 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi,
       */
       if (sql_mode_inited)
         thd->variables.sql_mode=
-          (ulong) ((thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE) |
-                   (sql_mode & ~(ulong) MODE_NO_DIR_IN_CREATE));
+          (sql_mode_t) ((thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE) |
+                        (sql_mode & ~(ulong) MODE_NO_DIR_IN_CREATE));
       if (charset_inited)
       {
         rpl_sql_thread_info *sql_info= thd->system_thread_info.rpl_sql_info;
@@ -10042,7 +10043,7 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi)
       extra columns on the slave. In that case, do not force
       MODE_NO_AUTO_VALUE_ON_ZERO.
     */
-    ulonglong saved_sql_mode= thd->variables.sql_mode;
+    sql_mode_t saved_sql_mode= thd->variables.sql_mode;
     if (!is_auto_inc_in_extra_columns())
       thd->variables.sql_mode= MODE_NO_AUTO_VALUE_ON_ZERO;
 
diff --git a/sql/log_event.h b/sql/log_event.h
@@ -754,7 +754,7 @@ typedef struct st_print_event_info
   bool flags2_inited;
   uint32 flags2;
   bool sql_mode_inited;
-  ulonglong sql_mode;		/* must be same as THD.variables.sql_mode */
+  sql_mode_t sql_mode;		/* must be same as THD.variables.sql_mode */
   ulong auto_increment_increment, auto_increment_offset;
   bool charset_inited;
   char charset[6]; // 3 variables, each of them storable in 2 bytes
@@ -1951,8 +1951,7 @@ class Query_log_event: public Log_event
   bool charset_inited;
 
   uint32 flags2;
-  /* In connections sql_mode is 32 bits now but will be 64 bits soon */
-  ulonglong sql_mode;
+  sql_mode_t sql_mode;
   ulong auto_increment_increment, auto_increment_offset;
   char charset[6];
   uint time_zone_len; /* 0 means uninited */
diff --git a/sql/mysqld.h b/sql/mysqld.h
@@ -17,7 +17,8 @@
 #ifndef MYSQLD_INCLUDED
 #define MYSQLD_INCLUDED
 
-#include "my_global.h" /* MYSQL_PLUGIN_IMPORT, FN_REFLEN, FN_EXTLEN */
+#include <my_global.h> /* MYSQL_PLUGIN_IMPORT, FN_REFLEN, FN_EXTLEN */
+#include "sql_basic_types.h"			/* query_id_t */
 #include "sql_bitmap.h"                         /* Bitmap */
 #include "my_decimal.h"                         /* my_decimal */
 #include "mysql_com.h"                     /* SERVER_VERSION_LENGTH */
@@ -698,7 +699,6 @@ enum enum_query_type
 
 
 /* query_id */
-typedef int64 query_id_t;
 extern query_id_t global_query_id;
 
 void unireg_end(void) __attribute__((noreturn));
diff --git a/sql/set_var.h b/sql/set_var.h
@@ -410,7 +410,7 @@ inline bool IS_SYSVAR_AUTOSIZE(void *ptr)
 
 bool fix_delay_key_write(sys_var *self, THD *thd, enum_var_type type);
 
-ulonglong expand_sql_mode(ulonglong sql_mode);
+sql_mode_t expand_sql_mode(sql_mode_t sql_mode);
 bool sql_mode_string_representation(THD *thd, sql_mode_t sql_mode, LEX_STRING *ls);
 int default_regex_flags_pcre(const THD *thd);
 
diff --git a/sql/sp.cc b/sql/sp.cc
@@ -41,7 +41,7 @@
 static int
 db_load_routine(THD *thd, stored_procedure_type type, sp_name *name,
                 sp_head **sphp,
-                ulonglong sql_mode, const char *params, const char *returns,
+                sql_mode_t sql_mode, const char *params, const char *returns,
                 const char *body, st_sp_chistics &chistics,
                 LEX_STRING *definer_user_name, LEX_STRING *definer_host_name,
                 longlong created, longlong modified,
@@ -539,7 +539,7 @@ db_find_routine(THD *thd, stored_procedure_type type, sp_name *name,
   char buff[65];
   String str(buff, sizeof(buff), &my_charset_bin);
   bool saved_time_zone_used= thd->time_zone_used;
-  ulonglong sql_mode, saved_mode= thd->variables.sql_mode;
+  sql_mode_t sql_mode, saved_mode= thd->variables.sql_mode;
   Open_tables_backup open_tables_state_backup;
   Stored_program_creation_ctx *creation_ctx;
   char definer_user_name_holder[USERNAME_LENGTH + 1];
@@ -727,11 +727,11 @@ Silence_deprecated_warning::handle_condition(
     @retval   0                     error
 */
 
-static sp_head *sp_compile(THD *thd, String *defstr, ulonglong sql_mode,
+static sp_head *sp_compile(THD *thd, String *defstr, sql_mode_t sql_mode,
                            Stored_program_creation_ctx *creation_ctx)
 {
   sp_head *sp;
-  ulonglong old_sql_mode= thd->variables.sql_mode;
+  sql_mode_t old_sql_mode= thd->variables.sql_mode;
   ha_rows old_select_limit= thd->variables.select_limit;
   sp_rcontext *old_spcont= thd->spcont;
   Silence_deprecated_warning warning_handler;
@@ -810,7 +810,7 @@ Bad_db_error_handler::handle_condition(THD *thd,
 static int
 db_load_routine(THD *thd, stored_procedure_type type,
                 sp_name *name, sp_head **sphp,
-                ulonglong sql_mode, const char *params, const char *returns,
+                sql_mode_t sql_mode, const char *params, const char *returns,
                 const char *body, st_sp_chistics &chistics,
                 LEX_STRING *definer_user_name, LEX_STRING *definer_host_name,
                 longlong created, longlong modified,
@@ -1024,7 +1024,7 @@ sp_create_routine(THD *thd, stored_procedure_type type, sp_head *sp)
   TABLE *table;
   char definer_buf[USER_HOST_BUFF_SIZE];
   LEX_STRING definer;
-  ulonglong saved_mode= thd->variables.sql_mode;
+  sql_mode_t saved_mode= thd->variables.sql_mode;
   MDL_key::enum_mdl_namespace mdl_type= type == TYPE_ENUM_FUNCTION ?
                                         MDL_key::FUNCTION : MDL_key::PROCEDURE;
 
@@ -2212,9 +2212,9 @@ show_create_sp(THD *thd, String *buf,
               st_sp_chistics *chistics,
               const LEX_STRING *definer_user,
               const LEX_STRING *definer_host,
-              ulonglong sql_mode)
+              sql_mode_t sql_mode)
 {
-  ulonglong old_sql_mode= thd->variables.sql_mode;
+  sql_mode_t old_sql_mode= thd->variables.sql_mode;
   /* Make some room to begin with */
   if (buf->alloc(100 + dblen + 1 + namelen + paramslen + returnslen + bodylen +
 		 chistics->comment.length + 10 /* length of " DEFINER= "*/ +
@@ -2301,7 +2301,8 @@ show_create_sp(THD *thd, String *buf,
 
 sp_head *
 sp_load_for_information_schema(THD *thd, TABLE *proc_table, String *db,
-                               String *name, ulong sql_mode, stored_procedure_type type,
+                               String *name, sql_mode_t sql_mode,
+                               stored_procedure_type type,
                                const char *returns, const char *params,
                                bool *free_sp_head)
 {
diff --git a/sql/sp.h b/sql/sp.h
@@ -200,7 +200,8 @@ TABLE *open_proc_table_for_read(THD *thd, Open_tables_backup *backup);
 
 sp_head *
 sp_load_for_information_schema(THD *thd, TABLE *proc_table, String *db,
-                               String *name, ulong sql_mode, stored_procedure_type type,
+                               String *name, sql_mode_t sql_mode,
+                               stored_procedure_type type,
                                const char *returns, const char *params,
                                bool *free_sp_head);
 
@@ -228,5 +229,5 @@ bool show_create_sp(THD *thd, String *buf,
               st_sp_chistics *chistics,
               const LEX_STRING *definer_user,
               const LEX_STRING *definer_host,
-	      ulonglong sql_mode);
+	      sql_mode_t sql_mode);
 #endif /* _SP_H_ */
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
@@ -2413,7 +2413,7 @@ sp_head::do_cont_backpatch()
 
 void
 sp_head::set_info(longlong created, longlong modified,
-                  st_sp_chistics *chistics, ulonglong sql_mode)
+                  st_sp_chistics *chistics, sql_mode_t sql_mode)
 {
   m_created= created;
   m_modified= modified;
diff --git a/sql/sp_head.h b/sql/sp_head.h
@@ -182,7 +182,7 @@ class sp_head :private Query_arena
 
   const char *m_tmp_query;	///< Temporary pointer to sub query string
   st_sp_chistics *m_chistics;
-  ulonglong m_sql_mode;		///< For SHOW CREATE and execution
+  sql_mode_t m_sql_mode;		///< For SHOW CREATE and execution
   LEX_STRING m_qname;		///< db.name
   bool m_explicit_name;         ///< Prepend the db name? */
   LEX_STRING m_db;
@@ -421,7 +421,7 @@ class sp_head :private Query_arena
                              Column_definition *field_def);
 
   void set_info(longlong created, longlong modified,
-		st_sp_chistics *chistics, ulonglong sql_mode);
+		st_sp_chistics *chistics, sql_mode_t sql_mode);
 
   void set_definer(const char *definer, uint definerlen);
   void set_definer(const LEX_STRING *user_name, const LEX_STRING *host_name);
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
@@ -1196,7 +1196,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
   bool check_no_resolve= specialflag & SPECIAL_NO_RESOLVE;
   char tmp_name[SAFE_NAME_LEN+1];
   int password_length;
-  ulonglong old_sql_mode= thd->variables.sql_mode;
+  sql_mode_t old_sql_mode= thd->variables.sql_mode;
   DBUG_ENTER("acl_load");
 
   thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
@@ -6600,7 +6600,7 @@ static bool grant_load(THD *thd, TABLE_LIST *tables)
   TABLE *t_table, *c_table, *p_table;
   bool check_no_resolve= specialflag & SPECIAL_NO_RESOLVE;
   MEM_ROOT *save_mem_root= thd->mem_root;
-  ulonglong old_sql_mode= thd->variables.sql_mode;
+  sql_mode_t old_sql_mode= thd->variables.sql_mode;
   DBUG_ENTER("grant_load");
 
   thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
@@ -9643,7 +9643,7 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list, bool handle_as_role)
   List_iterator <LEX_USER> user_list(list);
   TABLE_LIST tables[TABLES_MAX];
   bool binlog= false;
-  ulonglong old_sql_mode= thd->variables.sql_mode;
+  sql_mode_t old_sql_mode= thd->variables.sql_mode;
   DBUG_ENTER("mysql_drop_user");
   DBUG_PRINT("entry", ("Handle as %s", handle_as_role ? "role" : "user"));
 
diff --git a/sql/sql_basic_types.h b/sql/sql_basic_types.h
@@ -0,0 +1,25 @@
+/*
+   Copyright (c) 2000, 2016, Oracle and/or its affiliates.
+   Copyright (c) 2009, 2016, MariaDB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
+
+/* File that includes common types used globally in MariaDB */
+
+#ifndef SQL_TYPES_INCLUDED
+#define SQL_TYPES_INCLUDED
+
+typedef ulonglong sql_mode_t;
+typedef int64 query_id_t;
+#endif
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
@@ -330,6 +330,7 @@ TODO list:
 
 #include <my_global.h>                          /* NO_EMBEDDED_ACCESS_CHECKS */
 #include "sql_priv.h"
+#include "sql_basic_types.h"
 #include "sql_cache.h"
 #include "sql_parse.h"                          // check_table_access
 #include "tztime.h"                             // struct Time_zone
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
@@ -548,7 +548,7 @@ struct Query_cache_query_flags
   uint collation_connection_num;
   ha_rows limit;
   Time_zone *time_zone;
-  ulonglong sql_mode;
+  sql_mode_t sql_mode;
   ulong max_sort_length;
   ulong group_concat_max_len;
   ulong default_week_format;
diff --git a/sql/sql_class.h b/sql/sql_class.h
diff --git a/sql/sql_help.cc b/sql/sql_help.cc
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
diff --git a/sql/sql_select.h b/sql/sql_select.h
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
diff --git a/sql/table.cc b/sql/table.cc
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ static bool convert_const_to_int(THD thd, Item_field field_item,`
`413`	`413`	`if ((item)->const_item() && !(item)->is_expensive())`
`414`	`414`	`{`
`415`	`415`	`TABLE *table= field->table;`
`416`		`- ulonglong orig_sql_mode= thd->variables.sql_mode;`
	`416`	`+ sql_mode_t orig_sql_mode= thd->variables.sql_mode;`
`417`	`417`	`enum_check_fields orig_count_cuted_fields= thd->count_cuted_fields;`
`418`	`418`	`my_bitmap_map *old_maps[2];`
`419`	`419`	`ulonglong UNINIT_VAR(orig_field_val); /* original field value if valid */`
Original file line number	Diff line number	Diff line change
`@@ -6279,7 +6279,7 @@ Item create_temporal_literal(THD thd,`
`6279`	`6279`	`MYSQL_TIME_STATUS status;`
`6280`	`6280`	`MYSQL_TIME ltime;`
`6281`	`6281`	`Item *item= NULL;`
`6282`		`- ulonglong flags= sql_mode_for_dates(thd);`
	`6282`	`+ sql_mode_t flags= sql_mode_for_dates(thd);`
`6283`	`6283`
`6284`	`6284`	`switch(type)`
`6285`	`6285`	`{`
Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ class Item_func_time_to_sec :public Item_func_seconds_hybrid`
`529`	`529`
`530`	`530`	`class Item_temporal_func: public Item_func`
`531`	`531`	`{`
`532`		`- ulonglong sql_mode;`
	`532`	`+ sql_mode_t sql_mode;`
`533`	`533`	`public:`
`534`	`534`	`Item_temporal_func(THD *thd): Item_func(thd) {}`
`535`	`535`	`Item_temporal_func(THD thd, Item a): Item_func(thd, a) {}`