Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

9 files changed, 65 insertions, 34 deletions

diff --git a/sql/field.cc b/sql/field.cc
index b8d17f1b7d2..7850daac8c7 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -4699,15 +4699,19 @@ int Field_datetime::store(const char *from,uint len,CHARSET_INFO *cs)
   TIME time_tmp;
   int error;
   ulonglong tmp= 0;
+  enum enum_mysql_timestamp_type func_res;
   
-  if (str_to_datetime(from, len, &time_tmp,
-                      (TIME_FUZZY_DATE |
-                       (table->in_use->variables.sql_mode &
-                        (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE |
-                         MODE_INVALID_DATES))),
-                      &error) > MYSQL_TIMESTAMP_ERROR)
+  func_res= str_to_datetime(from, len, &time_tmp,
+                            (TIME_FUZZY_DATE |
+                             (table->in_use->variables.sql_mode &
+                              (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE |
+                               MODE_INVALID_DATES))),
+                            &error);
+  if ((int) func_res > (int) MYSQL_TIMESTAMP_ERROR)
     tmp= TIME_to_ulonglong_datetime(&time_tmp);
-  
+  else
+    error= 1;                                 // Fix if invalid zero date
+
   if (error)
     set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, 
                          ER_WARN_DATA_OUT_OF_RANGE,
@@ -7000,8 +7004,10 @@ longlong Field_bit::val_int(void)
 {
   ulonglong bits= 0;
   if (bit_len)
+  {
     bits= get_rec_bits(bit_ptr, bit_ofs, bit_len);
-  bits<<= (field_length * 8);
+    bits<<= (field_length * 8);
+  }
 
   switch (field_length) {
   case 0: return bits;
diff --git a/sql/handler.cc b/sql/handler.cc
index 4a01003f418..143e56fdc7c 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -107,7 +107,8 @@ struct show_table_type_st sys_table_types[]=
   {"FEDERATED",&have_federated_db,
    "Federated MySQL storage engine", DB_TYPE_FEDERATED_DB},
   {"BLACKHOLE",&have_blackhole_db,
-   "Storage engine designed to act as null storage", DB_TYPE_BLACKHOLE_DB},
+   "/dev/null storage engine (anything you write to it disappears)",
+   DB_TYPE_BLACKHOLE_DB},
   {NullS, NULL, NullS, DB_TYPE_UNKNOWN}
 };
 
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 3d1feee1f8c..c603d41fa2e 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -160,7 +160,8 @@ static DATE_TIME_FORMAT time_24hrs_format= {{0}, '\0', 0,
 static bool extract_date_time(DATE_TIME_FORMAT *format,
 			      const char *val, uint length, TIME *l_time,
                               timestamp_type cached_timestamp_type,
-                              const char **sub_pattern_end)
+                              const char **sub_pattern_end,
+                              const char *date_time_type)
 {
   int weekday= 0, yearday= 0, daypart= 0;
   int week_number= -1;
@@ -188,12 +189,12 @@ static bool extract_date_time(DATE_TIME_FORMAT *format,
 
   for (; ptr != end && val != val_end; ptr++)
   {
-
     if (*ptr == '%' && ptr+1 != end)
     {
       int val_len;
       char *tmp;
 
+      error= 0;
       /* Skip pre-space between each argument */
       while (val != val_end && my_isspace(cs, *val))
 	val++;
@@ -343,16 +344,22 @@ static bool extract_date_time(DATE_TIME_FORMAT *format,
 
         /* Time in AM/PM notation */
       case 'r':
-        error= extract_date_time(&time_ampm_format, val,
-                                 (uint)(val_end - val), l_time,
-                                 cached_timestamp_type, &val);
+        /*
+          We can't just set error here, as we don't want to generate two
+          warnings in case of errors
+        */
+        if (extract_date_time(&time_ampm_format, val,
+                              (uint)(val_end - val), l_time,
+                              cached_timestamp_type, &val, "time"))
+          DBUG_RETURN(1);
         break;
 
         /* Time in 24-hour notation */
       case 'T':
-        error= extract_date_time(&time_24hrs_format, val,
-                                 (uint)(val_end - val), l_time,
-                                 cached_timestamp_type, &val);
+        if (extract_date_time(&time_24hrs_format, val,
+                              (uint)(val_end - val), l_time,
+                              cached_timestamp_type, &val, "time"))
+          DBUG_RETURN(1);
         break;
 
         /* Conversion specifiers that match classes of characters */
@@ -471,6 +478,13 @@ static bool extract_date_time(DATE_TIME_FORMAT *format,
   DBUG_RETURN(0);
 
 err:
+  {
+    char buff[128];
+    strmake(buff, val_begin, min(length, sizeof(buff)-1));
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+                        ER_WRONG_VALUE_FOR_TYPE, ER(ER_WRONG_VALUE_FOR_TYPE),
+                        date_time_type, buff, "str_to_time");
+  }
   DBUG_RETURN(1);
 }
 
@@ -2972,7 +2986,7 @@ bool Item_func_str_to_date::get_date(TIME *ltime, uint fuzzy_date)
   date_time_format.format.str=    (char*) format->ptr();
   date_time_format.format.length= format->length();
   if (extract_date_time(&date_time_format, val->ptr(), val->length(),
-			ltime, cached_timestamp_type, 0))
+			ltime, cached_timestamp_type, 0, "datetime"))
     goto null_date;
   if (cached_timestamp_type == MYSQL_TIMESTAMP_TIME && ltime->day)
   {
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 0747e2740a3..86d31a9c2e8 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1052,17 +1052,17 @@ bool Query_log_event::write(IO_CACHE* file)
       of this x>=4 master segfault (expecting a zero when there is
       none). Remaining compatibility problems are: the older slave will not
       find the catalog; but it is will not crash, and it's not an issue
-      that it does not find the catalog as catalogs were not used in these older
-      MySQL versions (we store it in binlog and read it from relay log but do
-      nothing useful with it). What is an issue is that the older slave will
-      stop processing the Q_* blocks (and jumps to the db/query) as soon as it
-      sees unknown Q_CATALOG_NZ_CODE; so it will not be able to read
+      that it does not find the catalog as catalogs were not used in these
+      older MySQL versions (we store it in binlog and read it from relay log
+      but do nothing useful with it). What is an issue is that the older slave
+      will stop processing the Q_* blocks (and jumps to the db/query) as soon
+      as it sees unknown Q_CATALOG_NZ_CODE; so it will not be able to read
       Q_AUTO_INCREMENT*, Q_CHARSET and so replication will fail silently in
       various ways. Documented that you should not mix alpha/beta versions if
       they are not exactly the same version, with example of 5.0.3->5.0.2 and
       5.0.4->5.0.3. If replication is from older to new, the new will
       recognize Q_CATALOG_CODE and have no problem.
-      */
+    */
   }
   if (auto_increment_increment != 1)
   {
@@ -1265,7 +1265,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
     }
     case Q_CATALOG_NZ_CODE:
       if ((catalog_len= *pos))
-        catalog= (char*) pos+1;                           // Will be copied later
+        catalog= (char*) pos+1;                 // Will be copied later
       pos+= catalog_len+1;
       break;
     case Q_AUTO_INCREMENT:
@@ -4208,7 +4208,8 @@ int Append_block_log_event::exec_event(struct st_relay_log_info* rli)
       goto err;
     }
   }
-  else if ((fd = my_open(fname, O_WRONLY|O_APPEND|O_BINARY|O_NOFOLLOW, MYF(MY_WME))) < 0)
+  else if ((fd = my_open(fname, O_WRONLY | O_APPEND | O_BINARY | O_NOFOLLOW,
+                         MYF(MY_WME))) < 0)
   {
     slave_print_error(rli, my_errno,
                       "Error in %s event: could not open file '%s'",
@@ -4421,7 +4422,8 @@ int Execute_load_log_event::exec_event(struct st_relay_log_info* rli)
   Load_log_event* lev = 0;
 
   memcpy(p, ".info", 6);
-  if ((fd = my_open(fname, O_RDONLY|O_BINARY|O_NOFOLLOW, MYF(MY_WME))) < 0 ||
+  if ((fd = my_open(fname, O_RDONLY | O_BINARY | O_NOFOLLOW,
+                    MYF(MY_WME))) < 0 ||
       init_io_cache(&file, fd, IO_SIZE, READ_CACHE, (my_off_t)0, 0,
 		    MYF(MY_WME|MY_NABP)))
   {
diff --git a/sql/log_event.h b/sql/log_event.h
index ba5d74b1784..2985fcabb50 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -234,11 +234,13 @@ struct sql_ex_info
 /* these are codes, not offsets; not more than 256 values (1 byte). */
 #define Q_FLAGS2_CODE           0
 #define Q_SQL_MODE_CODE         1
+#ifndef TO_BE_DELETED
 /*
   Q_CATALOG_CODE is catalog with end zero stored; it is used only by MySQL
   5.0.x where 0<=x<=3.
 */
 #define Q_CATALOG_CODE          2
+#endif
 #define Q_AUTO_INCREMENT	3
 #define Q_CHARSET_CODE          4
 #define Q_TIME_ZONE_CODE        5
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 7249605f10c..f7a6fe6c7e8 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5334,3 +5334,5 @@ ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR
         eng "Can't load value from file with fixed size rows to variable"
 ER_CANT_CREATE_USER_WITH_GRANT 42000
 	eng "You are not allowed to create a user with GRANT"
+ER_WRONG_VALUE_FOR_TYPE  
+	eng "Incorrect %-.32s value: '%-.128s' for function %-.32s"
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 021d771cef1..df19c6e55fd 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -2733,7 +2733,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
     pthread_mutex_lock(&acl_cache->lock);
     error=replace_user_table(thd, tables[0].table, *Str,
 			     0, revoke_grant, create_new_users,
-                             thd->variables.sql_mode & MODE_NO_AUTO_CREATE_USER);
+                             test(thd->variables.sql_mode &
+                                  MODE_NO_AUTO_CREATE_USER));
     pthread_mutex_unlock(&acl_cache->lock);
     if (error)
     {
@@ -2939,7 +2940,8 @@ bool mysql_procedure_grant(THD *thd, TABLE_LIST *table_list,
     pthread_mutex_lock(&acl_cache->lock);
     error=replace_user_table(thd, tables[0].table, *Str,
 			     0, revoke_grant, create_new_users,
-                             thd->variables.sql_mode & MODE_NO_AUTO_CREATE_USER);
+                             test(thd->variables.sql_mode &
+                                  MODE_NO_AUTO_CREATE_USER));
     pthread_mutex_unlock(&acl_cache->lock);
     if (error)
     {
@@ -3065,7 +3067,8 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
     }
     if (replace_user_table(thd, tables[0].table, *Str,
                            (!db ? rights : 0), revoke_grant, create_new_users,
-                           thd->variables.sql_mode & MODE_NO_AUTO_CREATE_USER))
+                           test(thd->variables.sql_mode &
+                                MODE_NO_AUTO_CREATE_USER)))
       result= -1;
     else if (db)
     {
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index bd0b8926c6a..263f907f277 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1615,10 +1615,11 @@ typedef struct st_index_field_values
   SYNOPSIS
     schema_table_store_record()
     thd                   thread handler
-    table                 I_S table
+    table                 Information schema table to be updated
+
   RETURN
-    1	                  error
     0	                  success
+    1	                  error
 */
 
 static bool schema_table_store_record(THD *thd, TABLE *table)
@@ -1959,7 +1960,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
               }
             }
             if (schema_table_store_record(thd, table))
-              DBUG_RETURN(error);
+              goto err;
           }
           else
           {
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 8141de31275..bfbe8faebd3 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1398,7 +1398,7 @@ create_function_tail:
 	    uint unused1= 0;
 	    int unused2= 0;
 
-	    if (!(new_field= new_create_field(YYTHD, "",
+	    if (!(new_field= new_create_field(YYTHD, (char*) "",
 					      (enum enum_field_types)$8,
 			  		      lex->length, lex->dec, lex->type,
 			  		      (Item *)0, (Item *) 0, &cmt, 0,