diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2021-04-26 14:12:36 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2021-04-26 14:34:12 +0300 |
| commit | da4cbb7133d96e4fcdeacdfc4f99751438259511 (patch) | |
| tree | e8a89c10b142fabfa070b6361aedeb0bfba5204d | |
| parent | 84c0936af484cd90523c44885942386828732961 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-20605-gap-locks-debug.tar.gz | |
Revert "This is a try to implement the way of row_sel() testing."bb-10.2-MDEV-20605-gap-locks-debug10.2-MDEV-20605-gap-locks-debug
This reverts commit dc33c72c3ba69989e11f377aa902ed9b32f8854a.
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index c7fea7bf609..91d12f64fa5 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -62,8 +62,6 @@ this program; if not, write to the Free Software Foundation, Inc., #include <key.h> #include <sql_manager.h> -#include <my_stacktrace.h> - /* Include necessary InnoDB headers */ #include "btr0btr.h" #include "btr0cur.h" @@ -19561,53 +19559,6 @@ innodb_log_checksums_update( thd, *static_cast<const my_bool*>(save)); } -#ifdef UNIV_DEBUG -/* -static -void -innobase_debug_que_eval_set( - THD *thd, st_mysql_sys_var*, void *, const void *value) -{ - const char *value_str = *static_cast<const char* const*>(value); - trx_t* trx = innobase_trx_allocate(thd); - pars_info_t* info = pars_info_create(); - dberr_t err = que_eval_sql(info, value_str, FALSE, trx); - - innobase_commit_low(trx); - - trx_free_for_mysql(trx); -} -*/ - -static int innodb_debug_que_eval_validate(THD* thd, st_mysql_sys_var*, - void* save, st_mysql_value* value) -{ - dberr_t err = DB_ERROR; - char buf[STRING_BUFFER_USUAL_SIZE]; - int len = sizeof buf; - const char* query = value->val_str(value, buf, &len); - if (query) { - trx_t* trx = innobase_trx_allocate(thd); - row_mysql_lock_data_dictionary(trx); - pars_info_t* info = pars_info_create(); -// dict_table_get_low("SYS_FOREIGN"); - err = que_eval_sql(info, - "PROCEDURE BLABLABLA () IS\n" - "BEGIN\n" - "SELECT a FROM test/t;\n" - "END;\n" - , FALSE, trx); - innobase_commit_low(trx); - row_mysql_unlock_data_dictionary(trx); - trx_free_for_mysql(trx); - *static_cast<const char**>(save) = query; - } - return !query || (err != DB_SUCCESS); -} - - -#endif - static SHOW_VAR innodb_status_variables_export[]= { {"Innodb", (char*) &show_innodb_vars, SHOW_FUNC}, {NullS, NullS, SHOW_LONG} @@ -21254,13 +21205,6 @@ static MYSQL_SYSVAR_BOOL(debug_force_scrubbing, 0, "Perform extra scrubbing to increase test exposure", NULL, NULL, FALSE); - -char *innobase_debug_que_eval_sql; -static MYSQL_SYSVAR_STR(debug_que_eval_sql, innobase_debug_que_eval_sql, - PLUGIN_VAR_NOCMDARG|PLUGIN_VAR_MEMALLOC, - "blablabla", - innodb_debug_que_eval_validate, - NULL, /* innobase_debug_que_eval_set,*/ NULL); #endif /* UNIV_DEBUG */ static MYSQL_SYSVAR_BOOL(instrument_semaphores, innodb_instrument_semaphores, @@ -21484,7 +21428,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(background_scrub_data_check_interval), #ifdef UNIV_DEBUG MYSQL_SYSVAR(debug_force_scrubbing), - MYSQL_SYSVAR(debug_que_eval_sql), #endif MYSQL_SYSVAR(instrument_semaphores), MYSQL_SYSVAR(buf_dump_status_frequency), |