mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
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@mysql.com)
This commit is contained in:
@@ -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 @@ const char * const triggers_file_ext= ".TRG";
|
||||
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 @@ struct st_trigname
|
||||
};
|
||||
|
||||
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 @@ static File_option trigname_file_parameters[]=
|
||||
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 @@ Handle_old_incorrect_sql_modes_hook::process_unknown_string(char *&unknown_key,
|
||||
(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
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user