List:Commits« Previous MessageNext Message »
From:knielsen Date:December 21 2005 3:05pm
Subject:bk commit into 5.0 tree (knielsen:1.1998)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of knielsen. When knielsen 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.1998 05/12/21 16:05:13 knielsen@stripped +1 -0
  Merge bk-internal:/home/bk/mysql-5.0
  into  mysql.com:/usr/local/mysql/mysql-5.0

  sql/sql_trigger.cc
    1.38 05/12/21 16:05:08 knielsen@stripped +0 -0
    Auto merged

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.0/RESYNC

--- 1.37/sql/sql_trigger.cc	2005-12-11 13:26:10 +01:00
+++ 1.38/sql/sql_trigger.cc	2005-12-21 16:05:08 +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,14 +71,14 @@
 };
 
 static const LEX_STRING trigname_file_type=
-  {STRING_WITH_LEN("TRIGGERNAME")};
+  {(char *) STRING_WITH_LEN("TRIGGERNAME")};
 
 const char * const trigname_file_ext= ".TRN";
 
 static File_option trigname_file_parameters[]=
 {
   {
-    {STRING_WITH_LEN("trigger_table")},
+    {(char *) STRING_WITH_LEN("trigger_table")},
     offsetof(struct st_trigname, trigger_table),
    FILE_OPTIONS_ESTRING
   },
@@ -1243,7 +1243,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
       };
Thread
bk commit into 5.0 tree (knielsen:1.1998)knielsen21 Dec