mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel BitKeeper/etc/ignore: auto-union client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/comp_err.c: Auto merged include/decimal.h: Auto merged include/my_getopt.h: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged mysys/array.c: Auto merged mysys/hash.c: Auto merged mysys/typelib.c: Auto merged sql/derror.cc: Auto merged sql/event_data_objects.cc: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/filesort.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/rpl_utility.h: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_connect.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/structs.h: Auto merged sql/table.h: Auto merged sql/tztime.cc: Auto merged sql/unireg.cc: Auto merged storage/example/ha_example.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/heap/ha_heap.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/sort.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged strings/decimal.c: Auto merged strings/strtod.c: Auto merged include/hash.h: Manual merge with 5.1 main tree. mysys/my_getopt.c: Manual merge with 5.1 main tree. sql/field.h: Manual merge with 5.1 main tree. sql/ha_ndbcluster.cc: Manual merge with 5.1 main tree. sql/item_cmpfunc.h: Manual merge with 5.1 main tree. sql/item_create.cc: Manual merge with 5.1 main tree. sql/item_func.h: Manual merge with 5.1 main tree. sql/key.cc: Manual merge with 5.1 main tree. sql/lock.cc: Manual merge with 5.1 main tree. sql/mysqld.cc: Manual merge with 5.1 main tree. sql/set_var.cc: Manual merge with 5.1 main tree. sql/set_var.h: Manual merge with 5.1 main tree. sql/sql_base.cc: Manual merge with 5.1 main tree. sql/sql_handler.cc: Manual merge with 5.1 main tree. sql/sql_insert.cc: Manual merge with 5.1 main tree. sql/sql_plugin.cc: Manual merge with 5.1 main tree. sql/sql_table.cc: Manual merge with 5.1 main tree. sql/sql_yacc.yy: Manual merge with 5.1 main tree. sql/table.cc: Manual merge with 5.1 main tree. storage/innobase/handler/ha_innodb.cc: Manual merge with 5.1 main tree. storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Manual merge with 5.1 main tree. storage/ndb/tools/restore/restore_main.cpp: Manual merge with 5.1 main tree.
This commit is contained in:
unknown
@@ -114,7 +114,7 @@ public:
|
||||
Handle_old_incorrect_sql_modes_hook(char *file_path)
|
||||
:path(file_path)
|
||||
{};
|
||||
virtual bool process_unknown_string(char *&unknown_key, gptr base,
|
||||
virtual bool process_unknown_string(char *&unknown_key, uchar* base,
|
||||
MEM_ROOT *mem_root, char *end);
|
||||
};
|
||||
|
||||
@@ -125,7 +125,7 @@ public:
|
||||
LEX_STRING *trigger_table_arg)
|
||||
:path(file_path), trigger_table_value(trigger_table_arg)
|
||||
{};
|
||||
virtual bool process_unknown_string(char *&unknown_key, gptr base,
|
||||
virtual bool process_unknown_string(char *&unknown_key, uchar* base,
|
||||
MEM_ROOT *mem_root, char *end);
|
||||
private:
|
||||
char *path;
|
||||
@@ -484,7 +484,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
|
||||
trigname.trigger_table.length= tables->table_name_length;
|
||||
|
||||
if (sql_create_definition_file(NULL, &trigname_file, &trigname_file_type,
|
||||
(gptr)&trigname, trigname_file_parameters, 0))
|
||||
(uchar*)&trigname, trigname_file_parameters, 0))
|
||||
return 1;
|
||||
|
||||
/*
|
||||
@@ -574,7 +574,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
|
||||
/* Create trigger definition file. */
|
||||
|
||||
if (!sql_create_definition_file(NULL, &file, &triggers_file_type,
|
||||
(gptr)this, triggers_file_parameters, 0))
|
||||
(uchar*)this, triggers_file_parameters, 0))
|
||||
return 0;
|
||||
|
||||
err_with_cleanup:
|
||||
@@ -654,7 +654,7 @@ static bool save_trigger_file(Table_triggers_list *triggers, const char *db,
|
||||
triggers_file_ext, 0);
|
||||
file.str= file_buff;
|
||||
return sql_create_definition_file(NULL, &file, &triggers_file_type,
|
||||
(gptr)triggers, triggers_file_parameters,
|
||||
(uchar*)triggers, triggers_file_parameters,
|
||||
0);
|
||||
}
|
||||
|
||||
@@ -865,7 +865,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
|
||||
triggers->definition_modes_list.empty();
|
||||
triggers->definers_list.empty();
|
||||
|
||||
if (parser->parse((gptr)triggers, &table->mem_root,
|
||||
if (parser->parse((uchar*)triggers, &table->mem_root,
|
||||
triggers_file_parameters,
|
||||
TRG_NUM_REQUIRED_PARAMETERS,
|
||||
&sql_modes_hook))
|
||||
@@ -945,7 +945,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
|
||||
of routines used by statement.
|
||||
*/
|
||||
triggers->sroutines_key.length= 1+strlen(db)+1+strlen(table_name)+1;
|
||||
if (!(triggers->sroutines_key.str=
|
||||
if (!(triggers->sroutines_key.str= (char*)
|
||||
alloc_root(&table->mem_root, triggers->sroutines_key.length)))
|
||||
DBUG_RETURN(1);
|
||||
triggers->sroutines_key.str[0]= TYPE_ENUM_TRIGGER;
|
||||
@@ -1223,7 +1223,7 @@ add_table_for_trigger(THD *thd, sp_name *trig, bool if_exists,
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
|
||||
if (parser->parse((gptr)&trigname, thd->mem_root,
|
||||
if (parser->parse((uchar*)&trigname, thd->mem_root,
|
||||
trigname_file_parameters, 1,
|
||||
&trigger_table_hook))
|
||||
DBUG_RETURN(1);
|
||||
@@ -1360,8 +1360,8 @@ Table_triggers_list::change_table_name_in_triggers(THD *thd,
|
||||
It is OK to allocate some memory on table's MEM_ROOT since this
|
||||
table instance will be thrown out at the end of rename anyway.
|
||||
*/
|
||||
new_def.str= memdup_root(&trigger_table->mem_root, buff.ptr(),
|
||||
buff.length());
|
||||
new_def.str= (char*) memdup_root(&trigger_table->mem_root, buff.ptr(),
|
||||
buff.length());
|
||||
new_def.length= buff.length();
|
||||
on_table_name->str= new_def.str + before_on_len;
|
||||
on_table_name->length= on_q_table_name_len;
|
||||
@@ -1422,7 +1422,7 @@ Table_triggers_list::change_table_name_in_trignames(const char *db_name,
|
||||
trigname.trigger_table= *new_table_name;
|
||||
|
||||
if (sql_create_definition_file(NULL, &trigname_file, &trigname_file_type,
|
||||
(gptr)&trigname, trigname_file_parameters,
|
||||
(uchar*)&trigname, trigname_file_parameters,
|
||||
0))
|
||||
return trigger;
|
||||
}
|
||||
@@ -1663,7 +1663,7 @@ void Table_triggers_list::mark_fields_used(trg_event_type event)
|
||||
|
||||
bool
|
||||
Handle_old_incorrect_sql_modes_hook::process_unknown_string(char *&unknown_key,
|
||||
gptr base,
|
||||
uchar* base,
|
||||
MEM_ROOT *mem_root,
|
||||
char *end)
|
||||
{
|
||||
@@ -1706,7 +1706,7 @@ Handle_old_incorrect_sql_modes_hook::process_unknown_string(char *&unknown_key,
|
||||
|
||||
bool
|
||||
Handle_old_incorrect_trigger_table_hook::
|
||||
process_unknown_string(char *&unknown_key, gptr base, MEM_ROOT *mem_root,
|
||||
process_unknown_string(char *&unknown_key, uchar* base, MEM_ROOT *mem_root,
|
||||
char *end)
|
||||
{
|
||||
DBUG_ENTER("Handle_old_incorrect_trigger_table_hook::process_unknown_string");
|
||||
|
||||
Reference in New Issue
Block a user