mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Integrated table->ref_primary_key into table->part_of_key
Fixed bug in UNION client/mysqlbinlog.cc: Added error message handling to read_log_event() heap/hp_write.c: More debug info myisam/myisampack.c: Cleanup mysql-test/mysql-test-run.sh: Portability fixes. mysql-test/r/union.result: More tests cases for UNION mysql-test/t/union.test: More tests cases for UNION sql/Makefile.am: Added mysql_embed.h sql/item.cc: Fixed bug when using the same table multiple times in union. sql/log_event.cc: Removed use of ## construct (Portability problem) sql/log_event.h: Added error message handling to read_log_event() sql/mysql_priv.h: Added mysql_embed.h sql/opt_sum.cc: Cleanup sql/slave.cc: cleanup sql/sql_base.cc: Integrated table->ref_primary_key into table->part_of_key sql/sql_union.cc: Cleanup sql/table.cc: Integrated table->ref_primary_key into table->part_of_key sql/table.h: Integrated table->ref_primary_key into table->part_of_key
This commit is contained in:
@ -321,6 +321,7 @@ static void dump_remote_log_entries(const char* logname)
|
||||
|
||||
for(;;)
|
||||
{
|
||||
const char *error;
|
||||
len = net_safe_read(mysql);
|
||||
if (len == packet_error)
|
||||
die("Error reading packet from server: %s", mysql_error(mysql));
|
||||
@ -330,8 +331,8 @@ static void dump_remote_log_entries(const char* logname)
|
||||
len, net->read_pos[5]));
|
||||
Log_event * ev = Log_event::read_log_event(
|
||||
(const char*) net->read_pos + 1 ,
|
||||
len - 1);
|
||||
if(ev)
|
||||
len - 1, &error);
|
||||
if (ev)
|
||||
{
|
||||
ev->print(result_file, short_form, last_db);
|
||||
if(ev->get_type_code() == LOAD_EVENT)
|
||||
|
Reference in New Issue
Block a user