mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge with 4.0.21
BitKeeper/etc/logging_ok: auto-union Build-tools/mysql-copyright-2: Auto merged include/violite.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/fut/fut0lst.c: Auto merged innobase/ha/hash0hash.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/data0data.h: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/fsp0fsp.h: Auto merged innobase/include/hash0hash.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mem0dbg.ic: Auto merged innobase/include/mem0pool.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/sync0rw.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0roll.h: Auto merged innobase/include/trx0trx.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0rw.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/thr/thr0loc.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/usr/usr0sess.c: Auto merged innobase/ut/ut0mem.c: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_decimal.test: Auto merged mysys/mf_tempfile.c: Auto merged netware/BUILD/nwbootstrap: Auto merged netware/Makefile.am: Auto merged scripts/mysqld_safe.sh: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/t/func_if.test: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged support-files/my-innodb-heavy-4G.cnf.sh: Auto merged Build-tools/Do-compile: Merge with 4.0 Build-tools/mysql-copyright: Merge with 4.0 client/mysqltest.c: Merge with 4.0 include/my_global.h: Merge with 4.0 innobase/buf/buf0rea.c: Merge with 4.0 innobase/data/data0type.c: Merge with 4.0 innobase/ibuf/ibuf0ibuf.c: Merge with 4.0 innobase/include/buf0buf.h: Merge with 4.0 innobase/include/data0type.h: Merge with 4.0 innobase/include/mem0mem.h: Merge with 4.0 innobase/include/mem0mem.ic: Merge with 4.0 innobase/log/log0recv.c: Merge with 4.0 libmysql/libmysql.c: Merge with 4.0 libmysqld/Makefile.am: Merge with 4.0 mysql-test/r/range.result: Merge with 4.0 mysql-test/r/type_decimal.result: Merge with 4.0 mysql-test/t/range.test: Merge with 4.0 netware/BUILD/mwenv: Merge with 4.0 netware/mysql_test_run.c: Merge with 4.0 scripts/mysql_install_db.sh: Merge with 4.0 sql/field.cc: Merge with 4.0 sql/field.h: Merge with 4.0 sql/item_cmpfunc.h: Merge with 4.0 support-files/my-huge.cnf.sh: Merge with 4.0 support-files/my-large.cnf.sh: Merge with 4.0 support-files/my-medium.cnf.sh: Merge with 4.0 support-files/my-small.cnf.sh: Merge with 4.0 support-files/mysql.spec.sh: Merge with 4.0
This commit is contained in:
unknown
@ -1414,7 +1414,8 @@ row_create_table_for_mysql(
|
||||
tab_node_t* node;
|
||||
mem_heap_t* heap;
|
||||
que_thr_t* thr;
|
||||
ulint namelen;
|
||||
const char* table_name;
|
||||
ulint table_name_len;
|
||||
ulint err;
|
||||
|
||||
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
||||
@ -1466,10 +1467,17 @@ row_create_table_for_mysql(
|
||||
return(row_mysql_recover_tmp_table(table, trx));
|
||||
}
|
||||
|
||||
namelen = strlen(table->name) + 1;
|
||||
/* The table name is prefixed with the database name and a '/'.
|
||||
Certain table names starting with 'innodb_' have their special
|
||||
meaning regardless of the database name. Thus, we need to
|
||||
ignore the database name prefix in the comparisons. */
|
||||
table_name = strchr(table->name, '/');
|
||||
ut_a(table_name);
|
||||
table_name++;
|
||||
table_name_len = strlen(table_name) + 1;
|
||||
|
||||
if (namelen == sizeof S_innodb_monitor
|
||||
&& !memcmp(table->name, S_innodb_monitor,
|
||||
if (table_name_len == sizeof S_innodb_monitor
|
||||
&& !memcmp(table_name, S_innodb_monitor,
|
||||
sizeof S_innodb_monitor)) {
|
||||
|
||||
/* Table equals "innodb_monitor":
|
||||
@ -1481,27 +1489,27 @@ row_create_table_for_mysql(
|
||||
of InnoDB monitor prints */
|
||||
|
||||
os_event_set(srv_lock_timeout_thread_event);
|
||||
} else if (namelen == sizeof S_innodb_lock_monitor
|
||||
&& !memcmp(table->name, S_innodb_lock_monitor,
|
||||
} else if (table_name_len == sizeof S_innodb_lock_monitor
|
||||
&& !memcmp(table_name, S_innodb_lock_monitor,
|
||||
sizeof S_innodb_lock_monitor)) {
|
||||
|
||||
srv_print_innodb_monitor = TRUE;
|
||||
srv_print_innodb_lock_monitor = TRUE;
|
||||
os_event_set(srv_lock_timeout_thread_event);
|
||||
} else if (namelen == sizeof S_innodb_tablespace_monitor
|
||||
&& !memcmp(table->name, S_innodb_tablespace_monitor,
|
||||
} else if (table_name_len == sizeof S_innodb_tablespace_monitor
|
||||
&& !memcmp(table_name, S_innodb_tablespace_monitor,
|
||||
sizeof S_innodb_tablespace_monitor)) {
|
||||
|
||||
srv_print_innodb_tablespace_monitor = TRUE;
|
||||
os_event_set(srv_lock_timeout_thread_event);
|
||||
} else if (namelen == sizeof S_innodb_table_monitor
|
||||
&& !memcmp(table->name, S_innodb_table_monitor,
|
||||
} else if (table_name_len == sizeof S_innodb_table_monitor
|
||||
&& !memcmp(table_name, S_innodb_table_monitor,
|
||||
sizeof S_innodb_table_monitor)) {
|
||||
|
||||
srv_print_innodb_table_monitor = TRUE;
|
||||
os_event_set(srv_lock_timeout_thread_event);
|
||||
} else if (namelen == sizeof S_innodb_mem_validate
|
||||
&& !memcmp(table->name, S_innodb_mem_validate,
|
||||
} else if (table_name_len == sizeof S_innodb_mem_validate
|
||||
&& !memcmp(table_name, S_innodb_mem_validate,
|
||||
sizeof S_innodb_mem_validate)) {
|
||||
/* We define here a debugging feature intended for
|
||||
developers */
|
||||
@ -2204,6 +2212,7 @@ row_drop_table_for_mysql(
|
||||
que_thr_t* thr;
|
||||
que_t* graph;
|
||||
ulint err;
|
||||
const char* table_name;
|
||||
ulint namelen;
|
||||
ibool success;
|
||||
ibool locked_dictionary = FALSE;
|
||||
@ -2293,10 +2302,17 @@ row_drop_table_for_mysql(
|
||||
|
||||
trx_start_if_not_started(trx);
|
||||
|
||||
namelen = strlen(name) + 1;
|
||||
/* The table name is prefixed with the database name and a '/'.
|
||||
Certain table names starting with 'innodb_' have their special
|
||||
meaning regardless of the database name. Thus, we need to
|
||||
ignore the database name prefix in the comparisons. */
|
||||
table_name = strchr(name, '/');
|
||||
ut_a(table_name);
|
||||
table_name++;
|
||||
namelen = strlen(table_name) + 1;
|
||||
|
||||
if (namelen == sizeof S_innodb_monitor
|
||||
&& !memcmp(name, S_innodb_monitor,
|
||||
&& !memcmp(table_name, S_innodb_monitor,
|
||||
sizeof S_innodb_monitor)) {
|
||||
|
||||
/* Table name equals "innodb_monitor":
|
||||
@ -2305,17 +2321,17 @@ row_drop_table_for_mysql(
|
||||
srv_print_innodb_monitor = FALSE;
|
||||
srv_print_innodb_lock_monitor = FALSE;
|
||||
} else if (namelen == sizeof S_innodb_lock_monitor
|
||||
&& !memcmp(name, S_innodb_lock_monitor,
|
||||
&& !memcmp(table_name, S_innodb_lock_monitor,
|
||||
sizeof S_innodb_lock_monitor)) {
|
||||
srv_print_innodb_monitor = FALSE;
|
||||
srv_print_innodb_lock_monitor = FALSE;
|
||||
} else if (namelen == sizeof S_innodb_tablespace_monitor
|
||||
&& !memcmp(name, S_innodb_tablespace_monitor,
|
||||
&& !memcmp(table_name, S_innodb_tablespace_monitor,
|
||||
sizeof S_innodb_tablespace_monitor)) {
|
||||
|
||||
srv_print_innodb_tablespace_monitor = FALSE;
|
||||
} else if (namelen == sizeof S_innodb_table_monitor
|
||||
&& !memcmp(name, S_innodb_table_monitor,
|
||||
&& !memcmp(table_name, S_innodb_table_monitor,
|
||||
sizeof S_innodb_table_monitor)) {
|
||||
|
||||
srv_print_innodb_table_monitor = FALSE;
|
||||
|
||||
Reference in New Issue
Block a user