From: kent
Date: December 19 2005 4:36pm
Subject: bk commit into 5.1 tree (kent:1.1968) BUG#15842
List-Archive: http://lists.mysql.com/commits/264
X-Bug: 15842
Message-Id: <20051219163635.B5D347B65D5@boortz.dyndns.org>

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.1968 05/12/19 17:36:20 kent@stripped +2 -0
  sql_trigger.cc, item.cc:
    BUG#15842: Change in "item.cc" adding Item_sp_variable breaks compile on HP-UX 11.23
    Fix: make explicit conversion to non-constant string (char *)
    (change by anozdrin@stripped)

  sql/sql_trigger.cc
    1.38 05/12/19 17:35:13 kent@stripped +7 -7
    Make explicit conversion to non-constant string (char *)

  sql/item.cc
    1.162 05/12/19 17:35:13 kent@stripped +1 -1
    Make explicit conversion to non-constant string (char *)

# 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:	kent
# Host:	c-664072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new

--- 1.161/sql/item.cc	2005-12-12 20:55:12 +01:00
+++ 1.162/sql/item.cc	2005-12-19 17:35:13 +01:00
@@ -949,7 +949,7 @@
 *****************************************************************************/
 
 Item_case_expr::Item_case_expr(int case_expr_id)
-  :Item_sp_variable(STRING_WITH_LEN("case_expr")),
+  :Item_sp_variable((char *) STRING_WITH_LEN("case_expr")),
    m_case_expr_id(case_expr_id)
 {
 }

--- 1.37/sql/sql_trigger.cc	2005-12-09 12:39:41 +01:00
+++ 1.38/sql/sql_trigger.cc	2005-12-19 17:35:13 +01:00
@@ -21,7 +21,7 @@
 #include "parse_file.h"
 
 static const LEX_STRING triggers_file_type=
-  {STRING_WITH_LEN("TRIGGERS")};
+  {(char *) STRING_WITH_LEN("TRIGGERS")};
 
 const char * const triggers_file_ext= ".TRG";
 
@@ -34,17 +34,17 @@
 static File_option triggers_file_parameters[]=
 {
   {
-    {STRING_WITH_LEN("triggers") },
+    {(char *) STRING_WITH_LEN("triggers") },
     offsetof(class Table_triggers_list, definitions_list),
     FILE_OPTIONS_STRLIST
   },
   {
-    {STRING_WITH_LEN("sql_modes") },
+    {(char *) STRING_WITH_LEN("sql_modes") },
     offsetof(class Table_triggers_list, definition_modes_list),
     FILE_OPTIONS_ULLLIST
   },
   {
-    {STRING_WITH_LEN("definers") },
+    {(char *) STRING_WITH_LEN("definers") },
     offsetof(class Table_triggers_list, definers_list),
     FILE_OPTIONS_STRLIST
   },
@@ -71,7 +71,7 @@
 };
 
 static const LEX_STRING trigname_file_type=
-  {STRING_WITH_LEN("TRIGGERNAME")};
+  {(char *) STRING_WITH_LEN("TRIGGERNAME")};
 
 const char * const trigname_file_ext= ".TRN";
 
@@ -82,7 +82,7 @@
       FIXME: Length specified for "trigger_table" key is erroneous, problem
       caused by this are reported as BUG#14090 and should be fixed ASAP.
     */
-    {STRING_WITH_LEN("trigger_table")},
+    {(char *) STRING_WITH_LEN("trigger_table")},
     offsetof(struct st_trigname, trigger_table),
    FILE_OPTIONS_ESTRING
   },
@@ -1236,7 +1236,7 @@
                         (char *)path, "TRIGGER");
     File_option sql_modes_parameters=
       {
-        {STRING_WITH_LEN("sql_modes") },
+        {(char *) STRING_WITH_LEN("sql_modes") },
         offsetof(class Table_triggers_list, definition_modes_list),
         FILE_OPTIONS_ULLLIST
       };