diff options
author | unknown <monty@mysql.com> | 2005-10-27 15:15:01 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-10-27 15:15:01 +0300 |
commit | 2f2d0b60d4ce3402dc27b76eadbf5e7d3aa89c12 (patch) | |
tree | 7146608f0e572ee9d179f503804c0f2b4ba050f7 /sql/log_event.h | |
parent | bd3ec22f85dfeb1382e5a1a2aa27c9092c940603 (diff) | |
download | mariadb-git-2f2d0b60d4ce3402dc27b76eadbf5e7d3aa89c12.tar.gz |
Fixes during review of pushed code
Added back missing return in mysql_delete()
mysql-test/my_manage.c:
Cleanup: Remove some #ifdef
mysql-test/r/drop_temp_table.result:
Delete database that may be left from other test
mysql-test/t/drop_temp_table.test:
Delete database that may be left from other test
sql/log.cc:
false -> FALSE
true -> TRUE
Wait until readers_count is 0 (not just for a signal)
NOTE: it's very likely that the way to handle readers_count is wrong.
(We are in pthread_cond_wait freeing a mutex that is not the innermost mutex,
which can lead to deadlocks)
I will talk with Guilhem about this ASAP
sql/log_event.h:
Remove number from last even to help future merges
(all compilers I know of can handle this properly)
sql/sql_delete.cc:
Add back missing RETURN (was lost in a merge)
Indentation fixes
Diffstat (limited to 'sql/log_event.h')
-rw-r--r-- | sql/log_event.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 8acdf015464..7783a97f03f 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -430,11 +430,10 @@ enum Log_event_type /* Add new events here - right above this comment! - And change the ENUM_END_EVENT_MARKER below. - Existing events should never change their numbers + Existing events (except ENUM_END_EVENT) should never change their numbers */ - ENUM_END_EVENT= 19 /* end marker */ + ENUM_END_EVENT /* end marker */ }; /* |