Bug#54483: valgrind errors when making warnings for

Mattias Jonsson · Mattias Jonsson · commit 258d0320d7ec · 2010-12-22T15:45:17.000+01:00
multiline inserts into partition
Bug#57071: EXTRACT(WEEK from date_col) cannot be
allowed as partitioning function

Renamed function according to reviewers comments.
--BZR--
revision-id: mattias.jonsson@oracle.com-20101222144517-cbv3l5jlbd0mq5s8
property-branch-nick: b54483-51-bt_2
property-file-info: ld7:file_id59:sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa7:message33:better name of processor function4:path10:sql/item.hed7:file_id64:sp1f-item_func.h-19700101030959-fbjcbwkg66qubbzptqwh5w5evhnpukze7:message33:better name of processor function4:path15:sql/item_func.hed7:file_id68:sp1f-item_timefunc.h-19700101030959-o34ypz6ggolzqmhgsjnqh6inkvgugi467:message33:better name of processor function4:path19:sql/item_timefunc.hed7:file_id69:sp1f-sql_partition.cc-20050718113038-57h5bzswps6cel2y7k7qideue3ghbg3u7:message50:better name of processor function
property-file-info: Updated comment.4:path20:sql/sql_partition.ccee
testament3-sha1: c8535a0ff0a298da159a55552460b1f197311c3a
diff --git a/sql/item.h b/sql/item.h
@@ -970,7 +970,7 @@ class Item {
     for date functions. Also used by partitioning code to reject
     timezone-dependent expressions in a (sub)partitioning function.
   */
-  virtual bool is_arguments_valid_processor(uchar *bool_arg)
+  virtual bool check_valid_arguments_processor(uchar *bool_arg)
   {
     return FALSE;
   }
diff --git a/sql/item_func.h b/sql/item_func.h
@@ -248,7 +248,7 @@ class Item_func :public Item_result_field
     representation of a TIMESTAMP argument verbatim, and thus does not depend on
     the timezone.
    */
-  virtual bool is_arguments_valid_processor(uchar *bool_arg)
+  virtual bool check_valid_arguments_processor(uchar *bool_arg)
   {
     return has_timestamp_args();
   }
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
@@ -70,7 +70,7 @@ class Item_func_to_days :public Item_int_func
   enum_monotonicity_info get_monotonicity_info() const;
   longlong val_int_endpoint(bool left_endp, bool *incl_endp);
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_date_args();
   }
@@ -90,7 +90,7 @@ class Item_func_dayofmonth :public Item_int_func
     maybe_null=1; 
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_date_args();
   }
@@ -119,7 +119,7 @@ class Item_func_month :public Item_func
     maybe_null=1; 
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_date_args();
   }
@@ -152,7 +152,7 @@ class Item_func_dayofyear :public Item_int_func
     maybe_null=1; 
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_date_args();
   }
@@ -172,7 +172,7 @@ class Item_func_hour :public Item_int_func
     maybe_null=1;
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_time_args();
   }
@@ -192,7 +192,7 @@ class Item_func_minute :public Item_int_func
     maybe_null=1;
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_time_args();
   }
@@ -212,7 +212,7 @@ class Item_func_quarter :public Item_int_func
      maybe_null=1;
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_date_args();
   }
@@ -232,7 +232,7 @@ class Item_func_second :public Item_int_func
     maybe_null=1;
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_time_args();
   }
@@ -266,7 +266,7 @@ class Item_func_yearweek :public Item_int_func
     maybe_null=1;
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_date_args();
   }
@@ -288,7 +288,7 @@ class Item_func_year :public Item_int_func
     maybe_null=1;
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_date_args();
   }
@@ -322,7 +322,7 @@ class Item_func_weekday :public Item_func
     maybe_null=1;
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_date_args();
   }
@@ -355,7 +355,7 @@ class Item_func_unix_timestamp :public Item_int_func
     (and thus may not be used as a partitioning function)
     when its argument is NOT of the TIMESTAMP type.
   */
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_timestamp_args();
   }
@@ -380,7 +380,7 @@ class Item_func_time_to_sec :public Item_int_func
     max_length=10*MY_CHARSET_BIN_MB_MAXLEN;
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_time_args();
   }
@@ -637,7 +637,7 @@ class Item_func_from_days :public Item_date
   const char *func_name() const { return "from_days"; }
   bool get_date(MYSQL_TIME *res, uint fuzzy_date);
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return has_date_args() || has_time_args();
   }
@@ -767,7 +767,7 @@ class Item_extract :public Item_int_func
   bool eq(const Item *item, bool binary_cmp) const;
   virtual void print(String *str, enum_query_type query_type);
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     switch (int_type) {
     case INTERVAL_YEAR:
@@ -1053,7 +1053,7 @@ class Item_func_microsecond :public Item_int_func
     maybe_null=1;
   }
   bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
-  bool is_arguments_valid_processor(uchar *int_arg)
+  bool check_valid_arguments_processor(uchar *int_arg)
   {
     return !has_time_args();
   }
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
@@ -1014,12 +1014,13 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table,
   }
 
   /*
-    We don't allow creating partitions with timezone-dependent expressions as
-    a (sub)partitioning function, but we want to allow such expressions when
-    opening existing tables for easier maintenance. This exception should be
-    deprecated at some point in future so that we always throw an error.
+    We don't allow creating partitions with expressions with non matching
+    arguments as a (sub)partitioning function,
+    but we want to allow such expressions when opening existing tables for
+    easier maintenance. This exception should be deprecated at some point
+    in future so that we always throw an error.
   */
-  if (func_expr->walk(&Item::is_arguments_valid_processor,
+  if (func_expr->walk(&Item::check_valid_arguments_processor,
                       0, NULL))
   {
     if (is_create_table_ind)

Original file line number	Diff line number	Diff line change
`@@ -970,7 +970,7 @@ class Item {`
`970`	`970`	`for date functions. Also used by partitioning code to reject`
`971`	`971`	`timezone-dependent expressions in a (sub)partitioning function.`
`972`	`972`	`*/`
`973`		`- virtual bool is_arguments_valid_processor(uchar *bool_arg)`
	`973`	`+ virtual bool check_valid_arguments_processor(uchar *bool_arg)`
`974`	`974`	`{`
`975`	`975`	`return FALSE;`
`976`	`976`	`}`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ class Item_func :public Item_result_field`
`248`	`248`	`representation of a TIMESTAMP argument verbatim, and thus does not depend on`
`249`	`249`	`the timezone.`
`250`	`250`	`*/`
`251`		`- virtual bool is_arguments_valid_processor(uchar *bool_arg)`
	`251`	`+ virtual bool check_valid_arguments_processor(uchar *bool_arg)`
`252`	`252`	`{`
`253`	`253`	`return has_timestamp_args();`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class Item_func_to_days :public Item_int_func`
`70`	`70`	`enum_monotonicity_info get_monotonicity_info() const;`
`71`	`71`	`longlong val_int_endpoint(bool left_endp, bool *incl_endp);`
`72`	`72`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`73`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`73`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`74`	`74`	`{`
`75`	`75`	`return !has_date_args();`
`76`	`76`	`}`
`@@ -90,7 +90,7 @@ class Item_func_dayofmonth :public Item_int_func`
`90`	`90`	`maybe_null=1;`
`91`	`91`	`}`
`92`	`92`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`93`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`93`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`94`	`94`	`{`
`95`	`95`	`return !has_date_args();`
`96`	`96`	`}`
`@@ -119,7 +119,7 @@ class Item_func_month :public Item_func`
`119`	`119`	`maybe_null=1;`
`120`	`120`	`}`
`121`	`121`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`122`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`122`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`123`	`123`	`{`
`124`	`124`	`return !has_date_args();`
`125`	`125`	`}`
`@@ -152,7 +152,7 @@ class Item_func_dayofyear :public Item_int_func`
`152`	`152`	`maybe_null=1;`
`153`	`153`	`}`
`154`	`154`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`155`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`155`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`156`	`156`	`{`
`157`	`157`	`return !has_date_args();`
`158`	`158`	`}`
`@@ -172,7 +172,7 @@ class Item_func_hour :public Item_int_func`
`172`	`172`	`maybe_null=1;`
`173`	`173`	`}`
`174`	`174`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`175`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`175`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`176`	`176`	`{`
`177`	`177`	`return !has_time_args();`
`178`	`178`	`}`
`@@ -192,7 +192,7 @@ class Item_func_minute :public Item_int_func`
`192`	`192`	`maybe_null=1;`
`193`	`193`	`}`
`194`	`194`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`195`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`195`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`196`	`196`	`{`
`197`	`197`	`return !has_time_args();`
`198`	`198`	`}`
`@@ -212,7 +212,7 @@ class Item_func_quarter :public Item_int_func`
`212`	`212`	`maybe_null=1;`
`213`	`213`	`}`
`214`	`214`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`215`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`215`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`216`	`216`	`{`
`217`	`217`	`return !has_date_args();`
`218`	`218`	`}`
`@@ -232,7 +232,7 @@ class Item_func_second :public Item_int_func`
`232`	`232`	`maybe_null=1;`
`233`	`233`	`}`
`234`	`234`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`235`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`235`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`236`	`236`	`{`
`237`	`237`	`return !has_time_args();`
`238`	`238`	`}`
`@@ -266,7 +266,7 @@ class Item_func_yearweek :public Item_int_func`
`266`	`266`	`maybe_null=1;`
`267`	`267`	`}`
`268`	`268`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`269`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`269`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`270`	`270`	`{`
`271`	`271`	`return !has_date_args();`
`272`	`272`	`}`
`@@ -288,7 +288,7 @@ class Item_func_year :public Item_int_func`
`288`	`288`	`maybe_null=1;`
`289`	`289`	`}`
`290`	`290`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`291`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`291`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`292`	`292`	`{`
`293`	`293`	`return !has_date_args();`
`294`	`294`	`}`
`@@ -322,7 +322,7 @@ class Item_func_weekday :public Item_func`
`322`	`322`	`maybe_null=1;`
`323`	`323`	`}`
`324`	`324`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`325`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`325`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`326`	`326`	`{`
`327`	`327`	`return !has_date_args();`
`328`	`328`	`}`
`@@ -355,7 +355,7 @@ class Item_func_unix_timestamp :public Item_int_func`
`355`	`355`	`(and thus may not be used as a partitioning function)`
`356`	`356`	`when its argument is NOT of the TIMESTAMP type.`
`357`	`357`	`*/`
`358`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`358`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`359`	`359`	`{`
`360`	`360`	`return !has_timestamp_args();`
`361`	`361`	`}`
`@@ -380,7 +380,7 @@ class Item_func_time_to_sec :public Item_int_func`
`380`	`380`	`max_length=10*MY_CHARSET_BIN_MB_MAXLEN;`
`381`	`381`	`}`
`382`	`382`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`383`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`383`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`384`	`384`	`{`
`385`	`385`	`return !has_time_args();`
`386`	`386`	`}`
`@@ -637,7 +637,7 @@ class Item_func_from_days :public Item_date`
`637`	`637`	`const char *func_name() const { return "from_days"; }`
`638`	`638`	`bool get_date(MYSQL_TIME *res, uint fuzzy_date);`
`639`	`639`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`640`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`640`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`641`	`641`	`{`
`642`	`642`	`return has_date_args() \|\| has_time_args();`
`643`	`643`	`}`
`@@ -767,7 +767,7 @@ class Item_extract :public Item_int_func`
`767`	`767`	`bool eq(const Item *item, bool binary_cmp) const;`
`768`	`768`	`virtual void print(String *str, enum_query_type query_type);`
`769`	`769`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`770`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`770`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`771`	`771`	`{`
`772`	`772`	`switch (int_type) {`
`773`	`773`	`case INTERVAL_YEAR:`
`@@ -1053,7 +1053,7 @@ class Item_func_microsecond :public Item_int_func`
`1053`	`1053`	`maybe_null=1;`
`1054`	`1054`	`}`
`1055`	`1055`	`bool check_partition_func_processor(uchar *int_arg) {return FALSE;}`
`1056`		`- bool is_arguments_valid_processor(uchar *int_arg)`
	`1056`	`+ bool check_valid_arguments_processor(uchar *int_arg)`
`1057`	`1057`	`{`
`1058`	`1058`	`return !has_time_args();`
`1059`	`1059`	`}`