bk commit into 6.0 tree (mkindahl:1.2705)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
6.0 repository of mkindahl. When mkindahl 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@stripped, 2008-01-10 10:29:57+01:00, mkindahl@stripped +6 -0
  Post-merge fixes to make system build.

  client/client_priv.h@stripped, 2008-01-10 10:29:25+01:00, mkindahl@stripped +0 -1
    Removing duplicate enumeration constants OPT_MYSQL_REPLACE_INTO,
    OPT_BASE64_OUTPUT, and OPT_SERVER_ID.

  sql-common/client.c@stripped, 2008-01-10 10:29:41+01:00, mkindahl@stripped +1 -1
    Correcting cast in debug code.

  sql/item_cmpfunc.cc@stripped, 2008-01-10 10:29:31+01:00, mkindahl@stripped +1 -1
    Eliminating warning when returning -1 as an unsigned long long.

  sql/rpl_utility.cc@stripped, 2008-01-10 10:29:36+01:00, mkindahl@stripped +1 -1
    Eliminating warning when assigning -1 to an uint32

  sql/share/errmsg.txt@stripped, 2008-01-10 10:29:41+01:00, mkindahl@stripped +0 -23
    Removing duplicate error messages.

  sql/slave.cc@stripped, 2008-01-10 10:29:36+01:00, mkindahl@stripped +1 -1
    Eliminating warning where variable can be used unassigned.

diff -Nrup a/client/client_priv.h b/client/client_priv.h
--- a/client/client_priv.h	2007-12-19 11:09:46 +01:00
+++ b/client/client_priv.h	2008-01-10 10:29:25 +01:00
@@ -89,7 +89,6 @@ enum options_client
   OPT_SLAP_BLOB_COL,
   OPT_SLAP_LABEL,
   OPT_SLAP_AUTO_GENERATE_SELECT_COLUMNS,
-  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,
   OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
   OPT_AUTO_VERTICAL_OUTPUT,
   OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
diff -Nrup a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
--- a/sql/item_cmpfunc.cc	2007-12-14 12:09:03 +01:00
+++ b/sql/item_cmpfunc.cc	2008-01-10 10:29:31 +01:00
@@ -947,7 +947,7 @@ get_datetime_value(THD *thd, Item ***ite
     *is_null= item->null_value;
   }
   if (*is_null)
-    return -1;
+    return ~(ulonglong) 0;
   /*
     Convert strings to the integer DATE/DATETIME representation.
     Even if both dates provided in strings we can't compare them directly as
diff -Nrup a/sql/rpl_utility.cc b/sql/rpl_utility.cc
--- a/sql/rpl_utility.cc	2007-11-15 14:41:46 +01:00
+++ b/sql/rpl_utility.cc	2008-01-10 10:29:36 +01:00
@@ -164,7 +164,7 @@ uint32 table_def::calc_field_size(uint c
     break;
   }
   default:
-    length= -1;
+    length= ~(uint32) 0;
   }
   return length;
 }
diff -Nrup a/sql/share/errmsg.txt b/sql/share/errmsg.txt
--- a/sql/share/errmsg.txt	2007-12-19 11:09:51 +01:00
+++ b/sql/share/errmsg.txt	2008-01-10 10:29:41 +01:00
@@ -6226,28 +6226,5 @@ ER_BACKUP_SEND_DATA_RETRY
 ER_BACKUP_OPEN_TABLES
         eng "Open and lock tables failed in %-.64s"
 
-ER_VIEW_NO_CREATION_CTX
-  eng "View `%-.64s`.`%-.64s` has no creation context"
-ER_VIEW_INVALID_CREATION_CTX
-  eng "Creation context of view `%-.64s`.`%-.64s' is invalid"
-
-ER_SR_INVALID_CREATION_CTX
-  eng "Creation context of stored routine `%-.64s`.`%-.64s` is invalid"
-
-ER_TRG_CORRUPTED_FILE
-  eng "Corrupted TRG file for table `%-.64s`.`%-.64s`"
-ER_TRG_NO_CREATION_CTX
-  eng "Triggers for table `%-.64s`.`%-.64s` have no creation context"
-ER_TRG_INVALID_CREATION_CTX
-  eng "Trigger creation context of table `%-.64s`.`%-.64s` is invalid"
-
-ER_EVENT_INVALID_CREATION_CTX
-  eng "Creation context of event `%-.64s`.`%-.64s` is invalid"
-
-ER_TRG_CANT_OPEN_TABLE
-  eng "Cannot open table for trigger `%-.64s`.`%-.64s`"
-
-ER_CANT_CREATE_SROUTINE
-  eng "Cannot create stored routine `%-.64s`. Check warnings"
 ER_TABLESPACE_EXIST
   eng "Tablespace '%-.192s' already exists"
diff -Nrup a/sql/slave.cc b/sql/slave.cc
--- a/sql/slave.cc	2007-12-19 10:36:46 +01:00
+++ b/sql/slave.cc	2008-01-10 10:29:36 +01:00
@@ -1783,7 +1783,7 @@ static int exec_relay_log_event(THD* thd
 
     if (slave_trans_retries)
     {
-      int temp_err;
+      int temp_err= 0;
       if (exec_res && (temp_err= has_temporary_error(thd)))
       {
         const char *errmsg;
diff -Nrup a/sql-common/client.c b/sql-common/client.c
--- a/sql-common/client.c	2007-10-31 22:55:23 +01:00
+++ b/sql-common/client.c	2008-01-10 10:29:41 +01:00
@@ -2095,7 +2095,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons
   /* Check if version of protocol matches current one */
 
   mysql->protocol_version= net->read_pos[0];
-  DBUG_DUMP("packet",(char*) net->read_pos,10);
+  DBUG_DUMP("packet",(uchar*) net->read_pos,10);
   DBUG_PRINT("info",("mysql protocol version %d, server=%d",
 		     PROTOCOL_VERSION, mysql->protocol_version));
   if (mysql->protocol_version != PROTOCOL_VERSION)