mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
1fc7f2117b
"Server Variables for Plugins"
Implement support for plugins to declare server variables.
Demonstrate functionality by removing InnoDB specific code from sql/*
New feature for HASH - HASH_UNIQUE flag
New feature for DYNAMIC_ARRAY - initializer accepts preallocated ptr.
Completed support for plugin reference counting.
include/hash.h:
New flag for HASH
HASH_UNIQUE
include/my_getopt.h:
New data types for options: ENUM and SET.
Use typelib to enumerate possible values.
New flag variable:
my_getopt_skip_unknown
include/my_sys.h:
change to DYNAMIC_ARRAY init functions to support pre-allocated buffers
include/mysql.h:
relocate inclusion of typelib due to longlong requirement
include/mysql/plugin.h:
wl2936
New declarations for plugin server variable support.
New functions for use by plugins
include/mysys_err.h:
new my_getopt return value: EXIT_ARGUMENT_INVALID
include/typelib.h:
new typelib function: find_typeset(), returns an int which is a SET of
the elements in the typelib
mysql-test/r/im_utils.result:
change to more specific command line settings
--skip-innodb => --skip-plugin-innodb
etc.
mysql-test/r/log_tables.result:
set default storage engine to MEMORY so that test will succeed even
when some of the other named storage engines are not present
mysql-test/r/ndb_dd_basic.result:
change in error message
mysql-test/r/partition_innodb.result:
change in results
mysql-test/r/ps_1general.result:
bdb doesn't exist, use myisam for a non-transactional engine
mysql-test/r/variables.result:
information schema doesn't sort row results for server variables.
mysql-test/t/log_tables.test:
set default storage engine to MEMORY so that test will succeed even
when some of the other named storage engines are not present
mysql-test/t/ndb_dd_basic.test:
ALTER LOGFILE GROUP no longer silently fail here
mysql-test/t/partition_innodb.test:
ALTER TABLE no longer silently fails for unknown storage engine
mysql-test/t/ps_1general.test:
remove unneccessary parts
use myisam as it is an always present non-transactional engine
mysql-test/t/variables.test:
information schema doesn't sort row results for server variables.
mysql-test/t/warnings_engine_disabled-master.opt:
use the new style command line option
mysys/array.c:
change to DYNAMIC_ARRAY init functions to support pre-allocated buffers
mysys/hash.c:
New flag for HASH
HASH_UNIQUE
Implement HASH_UNIQUE functionality by performing a hash_search
mysys/my_getopt.c:
New data types for options: ENUM and SET.
Use typelib to enumerate possible values.
New flag variable:
my_getopt_skip_unknown
mysys/typelib.c:
new typelib function: find_typeset(), returns an int which is a SET of
the elements in the typelib
sql/ha_ndbcluster.cc:
use ha_statistic_increment() method instead of
statistic_increment() function
ha_ndbcluster variable has gone away.
sql/ha_partition.cc:
fix for reference counting
sql/ha_partition.h:
fix for reference counting
sql/handler.cc:
fixes for reference counting
sql/handler.h:
fixes for reference counting
some new methods to aid storage engine writers
sql/item_func.cc:
find_sys_var() function now requires thd
sql/item_sum.cc:
fixes for ref counting
sql/mysql_priv.h:
remove unneccessary globals.
new lock: LOCK_system_variables_hash
sql/mysqld.cc:
Remove InnoBase specific code.
Support plugin command line processing.
sql/set_var.cc:
Remove InnoBase specific declarations
Remove redundant declarations
changes to permit new variables at run time
changes for ref counting
sql/set_var.h:
changes to permit new variables at run time
changes for ref counting
sql/sql_base.cc:
changes for ref counting
sql/sql_cache.cc:
mark code as needing work in the future
sql/sql_class.cc:
new functions to aid plugin authors
initialize variables for dynamic plugin variables
sql/sql_class.h:
remove InnoBase specific declarations
New declarations for plugin variables.
sql/sql_connect.cc:
initialization and cleanup of plugin variables
sql/sql_delete.cc:
change for ref counting
sql/sql_insert.cc:
change for ref counting
sql/sql_lex.cc:
changes for ref counting and plugin variables
sql/sql_lex.h:
add properties for plugin ref counting,
add to distructor to clean up
sql/sql_partition.cc:
changes for ref counting
sql/sql_plugin.cc:
WL2936
Plugin Variables
New methods and code to support server variables for plugins.
New code to complete plugin reference counting
Debug code adds further indirection so that malloc debugging can be
used to aid finding plugin ref count leaks
sql/sql_plugin.h:
WL2936
Plugin Variables
New methods and code to support server variables for plugins.
New code to complete plugin reference counting
Debug code adds further indirection so that malloc debugging can be
used to aid finding plugin ref count leaks
sql/sql_repl.cc:
replication system variables moved here from set_var.cc
sql/sql_repl.h:
new function to initialise replication server variables
sql/sql_select.cc:
changes for ref counting
sql/sql_show.cc:
changes for ref counting
sql/sql_table.cc:
changes for ref counting
sql/sql_tablespace.cc:
use supplied functions instead of digging into data structures manually
sql/sql_yacc.yy:
changes for ref counting
find_sys_var() now requires thd parameter
changes on reporting errors to keep user-visible behaviour the same.
sql/structs.h:
changes for ref counting
sql/table.cc:
changes for ref counting
sql/table.h:
changes for ref counting
storage/federated/ha_federated.cc:
use ha_statistic_increment() method instead of statistic_increment()
function
storage/heap/ha_heap.cc:
use ha_statistic_increment() method instead of statistic_increment()
function
storage/innobase/handler/ha_innodb.cc:
use ha_statistic_increment() method instead of statistic_increment()
function
WL2936
Move InnoBase specific code out of mysqld.cc and into here
Declare all required server variables for InnoBase
storage/innobase/include/trx0trx.h:
store a bit more state so that InnoBase does not have to dig into
mysqld internal data structures.
storage/myisam/ha_myisam.cc:
use ha_statistic_increment() method instead of statistic_increment()
function
storage/myisammrg/ha_myisammrg.cc:
use ha_statistic_increment() method instead of statistic_increment()
function
289 lines
13 KiB
Text
289 lines
13 KiB
Text
use mysql;
|
|
truncate table general_log;
|
|
select * from general_log;
|
|
event_time user_host thread_id server_id command_type argument
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from general_log
|
|
truncate table slow_log;
|
|
select * from slow_log;
|
|
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text
|
|
truncate table general_log;
|
|
select * from general_log where argument like '%general_log%';
|
|
event_time user_host thread_id server_id command_type argument
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from general_log where argument like '%general_log%'
|
|
create table join_test (verbose_comment varchar (80), command_type varchar(64));
|
|
insert into join_test values ("User performed a usual SQL query", "Query");
|
|
insert into join_test values ("New DB connection was registered", "Connect");
|
|
insert into join_test values ("Get the table info", "Field List");
|
|
select verbose_comment, user_host, argument
|
|
from mysql.general_log join join_test
|
|
on (mysql.general_log.command_type = join_test.command_type);
|
|
verbose_comment user_host argument
|
|
User performed a usual SQL query USER_HOST select * from general_log where argument like '%general_log%'
|
|
User performed a usual SQL query USER_HOST create table join_test (verbose_comment varchar (80), command_type varchar(64))
|
|
User performed a usual SQL query USER_HOST insert into join_test values ("User performed a usual SQL query", "Query")
|
|
User performed a usual SQL query USER_HOST insert into join_test values ("New DB connection was registered", "Connect")
|
|
User performed a usual SQL query USER_HOST insert into join_test values ("Get the table info", "Field List")
|
|
User performed a usual SQL query USER_HOST select verbose_comment, user_host, argument
|
|
from mysql.general_log join join_test
|
|
on (mysql.general_log.command_type = join_test.command_type)
|
|
drop table join_test;
|
|
flush logs;
|
|
lock tables mysql.general_log WRITE;
|
|
ERROR HY000: You can't write-lock a log table. Only read access is possible
|
|
lock tables mysql.slow_log WRITE;
|
|
ERROR HY000: You can't write-lock a log table. Only read access is possible
|
|
lock tables mysql.general_log READ;
|
|
ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead
|
|
lock tables mysql.slow_log READ;
|
|
ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead
|
|
lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL;
|
|
unlock tables;
|
|
lock tables mysql.general_log READ LOCAL;
|
|
flush logs;
|
|
unlock tables;
|
|
select "Mark that we woke up from flush logs in the test"
|
|
as "test passed";
|
|
test passed
|
|
Mark that we woke up from flush logs in the test
|
|
lock tables mysql.general_log READ LOCAL;
|
|
truncate mysql.general_log;
|
|
unlock tables;
|
|
select "Mark that we woke up from TRUNCATE in the test"
|
|
as "test passed";
|
|
test passed
|
|
Mark that we woke up from TRUNCATE in the test
|
|
use test;
|
|
truncate table mysql.general_log;
|
|
set names utf8;
|
|
create table bug16905 (s char(15) character set utf8 default 'пусто');
|
|
insert into bug16905 values ('новое');
|
|
select * from mysql.general_log;
|
|
event_time user_host thread_id server_id command_type argument
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query set names utf8
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query create table bug16905 (s char(15) character set utf8 default 'пусто')
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query insert into bug16905 values ('новое')
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from mysql.general_log
|
|
drop table bug16905;
|
|
truncate table mysql.slow_log;
|
|
set session long_query_time=1;
|
|
select sleep(2);
|
|
sleep(2)
|
|
0
|
|
select * from mysql.slow_log;
|
|
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text
|
|
TIMESTAMP USER_HOST QUERY_TIME 00:00:00 1 0 test 0 0 1 select sleep(2)
|
|
alter table mysql.general_log engine=myisam;
|
|
ERROR HY000: You cannot 'ALTER' a log table if logging is enabled
|
|
alter table mysql.slow_log engine=myisam;
|
|
ERROR HY000: You cannot 'ALTER' a log table if logging is enabled
|
|
drop table mysql.general_log;
|
|
ERROR HY000: You cannot 'DROP' a log table if logging is enabled
|
|
drop table mysql.slow_log;
|
|
ERROR HY000: You cannot 'DROP' a log table if logging is enabled
|
|
set global general_log='OFF';
|
|
alter table mysql.slow_log engine=myisam;
|
|
ERROR HY000: You cannot 'ALTER' a log table if logging is enabled
|
|
set global slow_query_log='OFF';
|
|
show create table mysql.general_log;
|
|
Table Create Table
|
|
general_log CREATE TABLE `general_log` (
|
|
`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
`user_host` mediumtext,
|
|
`thread_id` int(11) DEFAULT NULL,
|
|
`server_id` int(11) DEFAULT NULL,
|
|
`command_type` varchar(64) DEFAULT NULL,
|
|
`argument` mediumtext
|
|
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log'
|
|
show create table mysql.slow_log;
|
|
Table Create Table
|
|
slow_log CREATE TABLE `slow_log` (
|
|
`start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
`user_host` mediumtext NOT NULL,
|
|
`query_time` time NOT NULL,
|
|
`lock_time` time NOT NULL,
|
|
`rows_sent` int(11) NOT NULL,
|
|
`rows_examined` int(11) NOT NULL,
|
|
`db` varchar(512) DEFAULT NULL,
|
|
`last_insert_id` int(11) DEFAULT NULL,
|
|
`insert_id` int(11) DEFAULT NULL,
|
|
`server_id` int(11) DEFAULT NULL,
|
|
`sql_text` mediumtext NOT NULL
|
|
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
|
|
alter table mysql.general_log engine=myisam;
|
|
alter table mysql.slow_log engine=myisam;
|
|
show create table mysql.general_log;
|
|
Table Create Table
|
|
general_log CREATE TABLE `general_log` (
|
|
`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
`user_host` mediumtext,
|
|
`thread_id` int(11) DEFAULT NULL,
|
|
`server_id` int(11) DEFAULT NULL,
|
|
`command_type` varchar(64) DEFAULT NULL,
|
|
`argument` mediumtext
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='General log'
|
|
show create table mysql.slow_log;
|
|
Table Create Table
|
|
slow_log CREATE TABLE `slow_log` (
|
|
`start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
`user_host` mediumtext NOT NULL,
|
|
`query_time` time NOT NULL,
|
|
`lock_time` time NOT NULL,
|
|
`rows_sent` int(11) NOT NULL,
|
|
`rows_examined` int(11) NOT NULL,
|
|
`db` varchar(512) DEFAULT NULL,
|
|
`last_insert_id` int(11) DEFAULT NULL,
|
|
`insert_id` int(11) DEFAULT NULL,
|
|
`server_id` int(11) DEFAULT NULL,
|
|
`sql_text` mediumtext NOT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Slow log'
|
|
set global general_log='ON';
|
|
set global slow_query_log='ON';
|
|
select * from mysql.general_log;
|
|
event_time user_host thread_id server_id command_type argument
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query set names utf8
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query create table bug16905 (s char(15) character set utf8 default 'пусто')
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query insert into bug16905 values ('новое')
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from mysql.general_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query drop table bug16905
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query truncate table mysql.slow_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query set session long_query_time=1
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select sleep(2)
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from mysql.slow_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query alter table mysql.general_log engine=myisam
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query alter table mysql.slow_log engine=myisam
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query drop table mysql.general_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query drop table mysql.slow_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query set global general_log='OFF'
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query set global slow_query_log='ON'
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from mysql.general_log
|
|
flush logs;
|
|
lock tables mysql.general_log WRITE;
|
|
ERROR HY000: You can't write-lock a log table. Only read access is possible
|
|
lock tables mysql.slow_log WRITE;
|
|
ERROR HY000: You can't write-lock a log table. Only read access is possible
|
|
lock tables mysql.general_log READ;
|
|
ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead
|
|
lock tables mysql.slow_log READ;
|
|
ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead
|
|
lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL;
|
|
unlock tables;
|
|
set global general_log='OFF';
|
|
set global slow_query_log='OFF';
|
|
set @save_storage_engine= @@session.storage_engine;
|
|
set storage_engine= MEMORY;
|
|
alter table mysql.slow_log engine=ndb;
|
|
ERROR HY000: This storage engine cannot be used for log tables"
|
|
alter table mysql.slow_log engine=innodb;
|
|
ERROR HY000: This storage engine cannot be used for log tables"
|
|
alter table mysql.slow_log engine=archive;
|
|
ERROR HY000: This storage engine cannot be used for log tables"
|
|
alter table mysql.slow_log engine=blackhole;
|
|
ERROR HY000: This storage engine cannot be used for log tables"
|
|
set storage_engine= @save_storage_engine;
|
|
drop table mysql.slow_log;
|
|
drop table mysql.general_log;
|
|
drop table mysql.general_log;
|
|
ERROR 42S02: Unknown table 'general_log'
|
|
drop table mysql.slow_log;
|
|
ERROR 42S02: Unknown table 'slow_log'
|
|
use mysql;
|
|
CREATE TABLE `general_log` (
|
|
`event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
|
|
ON UPDATE CURRENT_TIMESTAMP,
|
|
`user_host` mediumtext,
|
|
`thread_id` int(11) DEFAULT NULL,
|
|
`server_id` int(11) DEFAULT NULL,
|
|
`command_type` varchar(64) DEFAULT NULL,
|
|
`argument` mediumtext
|
|
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='General log';
|
|
CREATE TABLE `slow_log` (
|
|
`start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
|
|
ON UPDATE CURRENT_TIMESTAMP,
|
|
`user_host` mediumtext NOT NULL,
|
|
`query_time` time NOT NULL,
|
|
`lock_time` time NOT NULL,
|
|
`rows_sent` int(11) NOT NULL,
|
|
`rows_examined` int(11) NOT NULL,
|
|
`db` varchar(512) DEFAULT NULL,
|
|
`last_insert_id` int(11) DEFAULT NULL,
|
|
`insert_id` int(11) DEFAULT NULL,
|
|
`server_id` int(11) DEFAULT NULL,
|
|
`sql_text` mediumtext NOT NULL
|
|
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log';
|
|
set global general_log='ON';
|
|
set global slow_query_log='ON';
|
|
use test;
|
|
flush tables with read lock;
|
|
unlock tables;
|
|
use mysql;
|
|
lock tables general_log read local, help_category read local;
|
|
unlock tables;
|
|
use mysql;
|
|
RENAME TABLE general_log TO renamed_general_log;
|
|
ERROR HY000: Cannot rename 'general_log'. When logging enabled, rename to/from log table must rename two tables: the log table to an archive table and another table back to 'general_log'
|
|
RENAME TABLE slow_log TO renamed_slow_log;
|
|
ERROR HY000: Cannot rename 'slow_log'. When logging enabled, rename to/from log table must rename two tables: the log table to an archive table and another table back to 'slow_log'
|
|
truncate table general_log;
|
|
select * from general_log;
|
|
event_time user_host thread_id server_id command_type argument
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from general_log
|
|
truncate table slow_log;
|
|
select * from slow_log;
|
|
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text
|
|
create table general_log_new like general_log;
|
|
rename table general_log TO renamed_general_log, general_log_new TO general_log;
|
|
create table slow_log_new like slow_log;
|
|
rename table slow_log TO renamed_slow_log, slow_log_new TO slow_log;
|
|
rename table general_log TO general_log_new, renamed_general_log TO general_log, slow_log to renamed_slow_log;
|
|
ERROR HY000: Cannot rename 'slow_log'. When logging enabled, rename to/from log table must rename two tables: the log table to an archive table and another table back to 'slow_log'
|
|
select * from general_log;
|
|
event_time user_host thread_id server_id command_type argument
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query create table slow_log_new like slow_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query rename table slow_log TO renamed_slow_log, slow_log_new TO slow_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query rename table general_log TO general_log_new, renamed_general_log TO general_log, slow_log to renamed_slow_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from general_log
|
|
select * from renamed_general_log;
|
|
event_time user_host thread_id server_id command_type argument
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from general_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query truncate table slow_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query select * from slow_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query create table general_log_new like general_log
|
|
TIMESTAMP USER_HOST THREAD_ID 1 Query rename table general_log TO renamed_general_log, general_log_new TO general_log
|
|
select * from slow_log;
|
|
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text
|
|
select * from renamed_slow_log;
|
|
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text
|
|
set global general_log='OFF';
|
|
RENAME TABLE general_log TO general_log2;
|
|
set global slow_query_log='OFF';
|
|
RENAME TABLE slow_log TO slow_log2;
|
|
set global general_log='ON';
|
|
ERROR HY000: Cannot activate 'general' log
|
|
set global slow_query_log='ON';
|
|
ERROR HY000: Cannot activate 'slow query' log
|
|
RENAME TABLE general_log2 TO general_log;
|
|
RENAME TABLE slow_log2 TO slow_log;
|
|
set global general_log='ON';
|
|
set global slow_query_log='ON';
|
|
flush logs;
|
|
flush logs;
|
|
drop table renamed_general_log, renamed_slow_log;
|
|
use test;
|
|
use mysql;
|
|
repair table general_log;
|
|
Table Op Msg_type Msg_text
|
|
mysql.general_log repair status OK
|
|
repair table slow_log;
|
|
Table Op Msg_type Msg_text
|
|
mysql.slow_log repair status OK
|
|
create table general_log_new like general_log;
|
|
create table slow_log_new like slow_log;
|
|
show tables like "%log%";
|
|
Tables_in_mysql (%log%)
|
|
general_log
|
|
general_log_new
|
|
ndb_binlog_index
|
|
slow_log
|
|
slow_log_new
|
|
drop table slow_log_new, general_log_new;
|
|
use test;
|