diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-07-01 13:29:55 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-07-01 13:29:55 +0300 |
| commit | bbf8ebe87d7c3d3d07f56457168e8faa943f7d64 (patch) | |
| tree | 19b3f7557bf7e2e6708f85edfaa3397618e07cc8 /sql/slave.cc | |
| parent | e224c1238d58c99b10ff6f55f816bee09be146c8 (diff) | |
| download | mariadb-git-bbf8ebe87d7c3d3d07f56457168e8faa943f7d64.tar.gz | |
Code/testcase cleanups
mysql-test/r/insert_select.result:
Fixed results
mysql-test/r/join_outer.result:
New test case for inner join table dependency
mysql-test/t/insert_select.test:
Remove not used drop tables.
Fixed table names
mysql-test/t/join_outer.test:
New test case for inner join table dependency
sql/slave.cc:
Simple optimizations
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index fe668900da0..851c6ba4f02 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2146,8 +2146,7 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) DBUG_ASSERT(rli->sql_thd==thd); if (sql_slave_killed(thd,rli)) { - /* do not forget to free ev ! */ - if (ev) delete ev; + delete ev; return 1; } if (ev) |