diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-21 03:38:35 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-21 03:38:35 +0300 |
| commit | c1a80bc0615f15535bb297e0f065091b2945af21 (patch) | |
| tree | bd27d62de7286eca9070d981c59b7cc1c889d9f1 /sql/slave.cc | |
| parent | 5dbd7397bd0d268b02d2aacb16b8c288fcfa2e93 (diff) | |
| download | mariadb-git-c1a80bc0615f15535bb297e0f065091b2945af21.tar.gz | |
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
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 1a6a0910f54..a1b5045efd4 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -934,8 +934,9 @@ point. If you are sure that your master is ok, run this query manually on the\ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) { + const char *error_msg; Log_event * ev = Log_event::read_log_event((const char*)net->read_pos + 1, - event_len); + event_len, &error_msg); if (ev) { int type_code = ev->get_type_code(); |