diff options
| -rw-r--r-- | .bzrignore | 4 | ||||
| -rw-r--r-- | client/mysqltest.c | 1 | ||||
| -rw-r--r-- | sql/slave.cc | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 7 | ||||
| -rw-r--r-- | storage/maria/ha_maria.cc | 35 | ||||
| -rw-r--r-- | storage/maria/ha_maria.h | 5 |
6 files changed, 4 insertions, 50 deletions
diff --git a/.bzrignore b/.bzrignore index 6001873606c..18b01f4714a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3056,3 +3056,7 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +libmysql_r/client_settings.h +libmysqld/scheduler.cc +libmysqld/sql_connect.cc +libmysqld/sql_tablespace.cc diff --git a/client/mysqltest.c b/client/mysqltest.c index e530c235b41..fdee137fa98 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -64,7 +64,6 @@ enum { OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION, OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL, OPT_MAX_CONNECT_RETRIES, OPT_MARK_PROGRESS, OPT_LOG_DIR, OPT_TAIL_LINES, - OPT_MAX_CONNECT_RETRIES, OPT_MARK_PROGRESS, OPT_LOG_DIR, OPT_GLOBAL_SUBST }; diff --git a/sql/slave.cc b/sql/slave.cc index 4c73853f5e8..fcbd4eb841b 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -29,8 +29,6 @@ #include <errmsg.h> #include <mysys_err.h> -static Log_event* next_event(RELAY_LOG_INFO* rli); - #ifdef HAVE_REPLICATION #include "rpl_tblmap.h" diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a674a6702ed..92d938c6b79 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4505,13 +4505,6 @@ create_table_option: Lex->create_info.transactional= ($3 != 0 ? HA_CHOICE_YES : HA_CHOICE_NO); } - - | TRANSACTIONAL_SYM opt_equal ulong_num - { - Lex->create_info.used_fields|= HA_CREATE_USED_TRANSACTIONAL; - Lex->create_info.transactional= ($3 != 0 ? HA_CHOICE_YES : - HA_CHOICE_NO); - } ; default_charset: diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 678b88063db..362e89bb088 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -686,41 +686,6 @@ err: } #endif /* HAVE_REPLICATION */ - -bool ha_maria::check_if_locking_is_allowed(uint sql_command, - ulong type, TABLE *table, - uint count, uint current, - uint *system_count, - bool called_by_privileged_thread) -{ - /* - To be able to open and lock for reading system tables like 'mysql.proc', - when we already have some tables opened and locked, and avoid deadlocks - we have to disallow write-locking of these tables with any other tables. - */ - if (table->s->system_table && - table->reginfo.lock_type >= TL_WRITE_ALLOW_WRITE) - (*system_count)++; - - /* 'current' is an index, that's why '<=' below. */ - if (*system_count > 0 && *system_count <= current) - { - my_error(ER_WRONG_LOCK_OF_SYSTEM_TABLE, MYF(0)); - return FALSE; - } - - /* - Deny locking of the log tables, which is incompatible with - concurrent insert. Unless called from a logger THD (general_log_thd - or slow_log_thd) or by a privileged thread. - */ - if (!called_by_privileged_thread) - return check_if_log_table_locking_is_allowed(sql_command, type, table); - - return TRUE; -} - - /* Name is here without an extension */ int ha_maria::open(const char *name, int mode, uint test_if_locked) diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index 7675778ab5b..2813e2ce037 100644 --- a/storage/maria/ha_maria.h +++ b/storage/maria/ha_maria.h @@ -66,11 +66,6 @@ public: uint checksum() const; virtual double scan_time(); - virtual bool check_if_locking_is_allowed(uint sql_command, - ulong type, TABLE * table, - uint count, uint current, - uint *system_count, - bool called_by_logger_thread); int open(const char *name, int mode, uint test_if_locked); int close(void); int write_row(uchar * buf); |