bk commit into 5.0 tree (monty:1.1865)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1865 05/04/05 01:19:48 monty@stripped +4 -0
  Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)

  sql/sql_table.cc
    1.233 05/04/05 01:19:44 monty@stripped +5 -3
    Fixed comment

  sql/sql_error.cc
    1.31 05/04/05 01:19:44 monty@stripped +1 -1
    Fixed comment

  sql/sql_class.h
    1.230 05/04/05 01:19:44 monty@stripped +2 -1
    Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)

  sql/item_timefunc.cc
    1.79 05/04/05 01:19:44 monty@stripped +1 -1
    Removed warning reported by valgrind

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-5.0

--- 1.78/sql/item_timefunc.cc	2005-04-01 15:04:44 +03:00
+++ 1.79/sql/item_timefunc.cc	2005-04-05 01:19:44 +03:00
@@ -2199,7 +2199,7 @@
     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                         ER_TRUNCATED_WRONG_VALUE,
                         ER(ER_TRUNCATED_WRONG_VALUE), char_type,
-                        res->c_ptr());
+                        res->c_ptr_safe());
     res->length((uint) length);
   }
   null_value= 0;

--- 1.229/sql/sql_class.h	2005-04-04 16:45:19 +03:00
+++ 1.230/sql/sql_class.h	2005-04-05 01:19:44 +03:00
@@ -1410,7 +1410,8 @@
   inline void send_kill_message() const
   {
     int err= killed_errno();
-    my_message(err, ER(err), MYF(0));
+    if (err)
+      my_message(err, ER(err), MYF(0));
   }
   /* return TRUE if we will abort query if we make a warning now */
   inline bool really_abort_on_warning()

--- 1.232/sql/sql_table.cc	2005-04-04 16:45:20 +03:00
+++ 1.233/sql/sql_table.cc	2005-04-05 01:19:44 +03:00
@@ -3740,9 +3740,11 @@
       goto err;
   };
 
-  /* Handler must be told explicitly to retrieve all columns, because
-     this function does not set field->query_id in the columns to the
-     current query id */
+  /*
+    Handler must be told explicitly to retrieve all columns, because
+    this function does not set field->query_id in the columns to the
+    current query id
+  */
   from->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
   init_read_record(&info, thd, from, (SQL_SELECT *) 0, 1,1);
   if (ignore ||

--- 1.30/sql/sql_error.cc	2005-04-05 00:32:44 +03:00
+++ 1.31/sql/sql_error.cc	2005-04-05 01:19:44 +03:00
@@ -133,7 +133,7 @@
 
     thd->spcont= spcont;
     thd->no_warnings_for_error= no_warnings_for_error;
-    /* Store error in error list (as my_message() didn't do it in this case */
+    /* Store error in error list (as my_message() didn't do it) */
     level= MYSQL_ERROR::WARN_LEVEL_ERROR;
   }