Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
5b19ff65
Commit
5b19ff65
authored
Jul 04, 2013
by
Sergey Petrunya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update more test results (all checked).
parent
d3cbc39b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
46 deletions
+76
-46
mysql-test/r/grant.result
mysql-test/r/grant.result
+4
-1
mysql-test/r/log_slow.result
mysql-test/r/log_slow.result
+1
-0
mysql-test/r/mysqld--help.result
mysql-test/r/mysqld--help.result
+66
-38
mysql-test/r/system_mysql_db.result
mysql-test/r/system_mysql_db.result
+5
-7
No files found.
mysql-test/r/grant.result
View file @
5b19ff65
...
@@ -55,6 +55,7 @@ max_connections 0
...
@@ -55,6 +55,7 @@ max_connections 0
max_user_connections 0
max_user_connections 0
plugin
plugin
authentication_string
authentication_string
password_expired N
show grants for mysqltest_1@localhost;
show grants for mysqltest_1@localhost;
Grants for mysqltest_1@localhost
Grants for mysqltest_1@localhost
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA'
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA'
...
@@ -126,6 +127,7 @@ max_connections 0
...
@@ -126,6 +127,7 @@ max_connections 0
max_user_connections 0
max_user_connections 0
plugin
plugin
authentication_string
authentication_string
password_expired N
show grants for mysqltest_1@localhost;
show grants for mysqltest_1@localhost;
Grants for mysqltest_1@localhost
Grants for mysqltest_1@localhost
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10
...
@@ -173,6 +175,7 @@ max_connections 30
...
@@ -173,6 +175,7 @@ max_connections 30
max_user_connections 0
max_user_connections 0
plugin
plugin
authentication_string
authentication_string
password_expired N
show grants for mysqltest_1@localhost;
show grants for mysqltest_1@localhost;
Grants for mysqltest_1@localhost
Grants for mysqltest_1@localhost
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 20 MAX_CONNECTIONS_PER_HOUR 30
GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 20 MAX_CONNECTIONS_PER_HOUR 30
...
@@ -1353,7 +1356,7 @@ FLUSH PRIVILEGES;
...
@@ -1353,7 +1356,7 @@ FLUSH PRIVILEGES;
DROP TABLE mysql.user;
DROP TABLE mysql.user;
drop table if exists test;
drop table if exists test;
Warnings:
Warnings:
Note 1051 Unknown table 'test'
Note 1051 Unknown table 'test
.test
'
drop function if exists test_function;
drop function if exists test_function;
Warnings:
Warnings:
Note 1305 FUNCTION test.test_function does not exist
Note 1305 FUNCTION test.test_function does not exist
...
...
mysql-test/r/log_slow.result
View file @
5b19ff65
...
@@ -55,6 +55,7 @@ last_insert_id int(11) NO NULL
...
@@ -55,6 +55,7 @@ last_insert_id int(11) NO NULL
insert_id int(11) NO NULL
insert_id int(11) NO NULL
server_id int(10) unsigned NO NULL
server_id int(10) unsigned NO NULL
sql_text mediumtext NO NULL
sql_text mediumtext NO NULL
thread_id bigint(21) unsigned NO NULL
flush slow logs;
flush slow logs;
set @@log_slow_filter=default;
set @@log_slow_filter=default;
set @@log_slow_verbosity=default;
set @@log_slow_verbosity=default;
mysql-test/r/mysqld--help.result
View file @
5b19ff65
...
@@ -202,6 +202,7 @@ The following options may be given as the first argument:
...
@@ -202,6 +202,7 @@ The following options may be given as the first argument:
The maximum length of the result of function
The maximum length of the result of function
GROUP_CONCAT()
GROUP_CONCAT()
-?, --help Display this help and exit.
-?, --help Display this help and exit.
--host-cache-size=# How many host names should be cached to avoid resolving.
--ignore-builtin-innodb
--ignore-builtin-innodb
Disable initialization of builtin InnoDB plugin
Disable initialization of builtin InnoDB plugin
--ignore-db-dirs=name
--ignore-db-dirs=name
...
@@ -407,6 +408,8 @@ The following options may be given as the first argument:
...
@@ -407,6 +408,8 @@ The following options may be given as the first argument:
--memlock Lock mysqld in memory.
--memlock Lock mysqld in memory.
--metadata-locks-cache-size=#
--metadata-locks-cache-size=#
Size of unused metadata locks cache
Size of unused metadata locks cache
--metadata-locks-hash-instances=#
Number of metadata locks hash instances
--min-examined-row-limit=#
--min-examined-row-limit=#
Don't write queries to slow log that examine fewer rows
Don't write queries to slow log that examine fewer rows
than that
than that
...
@@ -500,8 +503,10 @@ The following options may be given as the first argument:
...
@@ -500,8 +503,10 @@ The following options may be given as the first argument:
val is one of {on, off, default}
val is one of {on, off, default}
--performance-schema
--performance-schema
Enable the performance schema.
Enable the performance schema.
(Defaults to on; use --skip-performance-schema to disable.)
--performance-schema-accounts-size=#
--performance-schema-accounts-size=#
Maximum number of instrumented user@host accounts.
Maximum number of instrumented user@host accounts. Use 0
to disable, -1 for automated sizing.
--performance-schema-consumer-events-stages-current
--performance-schema-consumer-events-stages-current
Default startup value for the events_stages_current
Default startup value for the events_stages_current
consumer.
consumer.
...
@@ -542,64 +547,84 @@ The following options may be given as the first argument:
...
@@ -542,64 +547,84 @@ The following options may be given as the first argument:
consumer.
consumer.
(Defaults to on; use --skip-performance-schema-consumer-thread-instrumentation to disable.)
(Defaults to on; use --skip-performance-schema-consumer-thread-instrumentation to disable.)
--performance-schema-digests-size=#
--performance-schema-digests-size=#
Size of the statement digest.
Size of the statement digest. Use 0 to disable, -1 for
automated sizing.
--performance-schema-events-stages-history-long-size=#
--performance-schema-events-stages-history-long-size=#
Number of rows in EVENTS_STAGES_HISTORY_LONG.
Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to
disable, -1 for automated sizing.
--performance-schema-events-stages-history-size=#
--performance-schema-events-stages-history-size=#
Number of rows per thread in EVENTS_STAGES_HISTORY.
Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0
to disable, -1 for automated sizing.
--performance-schema-events-statements-history-long-size=#
--performance-schema-events-statements-history-long-size=#
Number of rows in EVENTS_STATEMENTS_HISTORY_LONG.
Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0
to disable, -1 for automated sizing.
--performance-schema-events-statements-history-size=#
--performance-schema-events-statements-history-size=#
Number of rows per thread in EVENTS_STATEMENTS_HISTORY.
Number of rows per thread in EVENTS_STATEMENTS_HISTORY.
Use 0 to disable, -1 for automated sizing.
--performance-schema-events-waits-history-long-size=#
--performance-schema-events-waits-history-long-size=#
Number of rows in EVENTS_WAITS_HISTORY_LONG.
Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to
disable, -1 for automated sizing.
--performance-schema-events-waits-history-size=#
--performance-schema-events-waits-history-size=#
Number of rows per thread in EVENTS_WAITS_HISTORY.
Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0
to disable, -1 for automated sizing.
--performance-schema-hosts-size=#
--performance-schema-hosts-size=#
Maximum number of instrumented hosts.
Maximum number of instrumented hosts. Use 0 to disable,
-1 for automated sizing.
--performance-schema-instrument[=name]
--performance-schema-instrument[=name]
Default startup value for a performance schema
Default startup value for a performance schema
instrument.
instrument.
--performance-schema-max-cond-classes=#
--performance-schema-max-cond-classes=#
Maximum number of condition instruments.
Maximum number of condition instruments.
--performance-schema-max-cond-instances=#
--performance-schema-max-cond-instances=#
Maximum number of instrumented condition objects.
Maximum number of instrumented condition objects. Use 0
to disable, -1 for automated sizing.
--performance-schema-max-file-classes=#
--performance-schema-max-file-classes=#
Maximum number of file instruments.
Maximum number of file instruments.
--performance-schema-max-file-handles=#
--performance-schema-max-file-handles=#
Maximum number of opened instrumented files.
Maximum number of opened instrumented files.
--performance-schema-max-file-instances=#
--performance-schema-max-file-instances=#
Maximum number of instrumented files.
Maximum number of instrumented files. Use 0 to disable,
-1 for automated sizing.
--performance-schema-max-mutex-classes=#
--performance-schema-max-mutex-classes=#
Maximum number of mutex instruments.
Maximum number of mutex instruments.
--performance-schema-max-mutex-instances=#
--performance-schema-max-mutex-instances=#
Maximum number of instrumented MUTEX objects.
Maximum number of instrumented MUTEX objects. Use 0 to
disable, -1 for automated sizing.
--performance-schema-max-rwlock-classes=#
--performance-schema-max-rwlock-classes=#
Maximum number of rwlock instruments.
Maximum number of rwlock instruments.
--performance-schema-max-rwlock-instances=#
--performance-schema-max-rwlock-instances=#
Maximum number of instrumented RWLOCK objects.
Maximum number of instrumented RWLOCK objects. Use 0 to
disable, -1 for automated sizing.
--performance-schema-max-socket-classes=#
--performance-schema-max-socket-classes=#
Maximum number of socket instruments.
Maximum number of socket instruments.
--performance-schema-max-socket-instances=#
--performance-schema-max-socket-instances=#
Maximum number of opened instrumented sockets.
Maximum number of opened instrumented sockets. Use 0 to
disable, -1 for automated sizing.
--performance-schema-max-stage-classes=#
--performance-schema-max-stage-classes=#
Maximum number of stage instruments.
Maximum number of stage instruments.
--performance-schema-max-statement-classes=#
--performance-schema-max-statement-classes=#
Maximum number of statement instruments.
Maximum number of statement instruments.
--performance-schema-max-table-handles=#
--performance-schema-max-table-handles=#
Maximum number of opened instrumented tables.
Maximum number of opened instrumented tables. Use 0 to
disable, -1 for automated sizing.
--performance-schema-max-table-instances=#
--performance-schema-max-table-instances=#
Maximum number of instrumented tables.
Maximum number of instrumented tables. Use 0 to disable,
-1 for automated sizing.
--performance-schema-max-thread-classes=#
--performance-schema-max-thread-classes=#
Maximum number of thread instruments.
Maximum number of thread instruments.
--performance-schema-max-thread-instances=#
--performance-schema-max-thread-instances=#
Maximum number of instrumented threads.
Maximum number of instrumented threads. Use 0 to disable,
-1 for automated sizing.
--performance-schema-session-connect-attrs-size=#
Size of session attribute string buffer per thread. Use 0
to disable, -1 for automated sizing.
--performance-schema-setup-actors-size=#
--performance-schema-setup-actors-size=#
Maximum number of rows in SETUP_ACTORS.
Maximum number of rows in SETUP_ACTORS.
--performance-schema-setup-objects-size=#
--performance-schema-setup-objects-size=#
Maximum number of rows in SETUP_OBJECTS.
Maximum number of rows in SETUP_OBJECTS.
--performance-schema-users-size=#
--performance-schema-users-size=#
Maximum number of instrumented users.
Maximum number of instrumented users. Use 0 to disable,
-1 for automated sizing.
--pid-file=name Pid file used by safe_mysqld
--pid-file=name Pid file used by safe_mysqld
--plugin-dir=name Directory for plugins
--plugin-dir=name Directory for plugins
--plugin-load=name Semicolon-separated list of plugins to load, where each
--plugin-load=name Semicolon-separated list of plugins to load, where each
...
@@ -990,6 +1015,7 @@ gdb FALSE
...
@@ -990,6 +1015,7 @@ gdb FALSE
general-log FALSE
general-log FALSE
group-concat-max-len 1024
group-concat-max-len 1024
help TRUE
help TRUE
host-cache-size 128
ignore-builtin-innodb FALSE
ignore-builtin-innodb FALSE
ignore-db-dirs
ignore-db-dirs
init-connect
init-connect
...
@@ -1039,7 +1065,7 @@ max-allowed-packet 1048576
...
@@ -1039,7 +1065,7 @@ max-allowed-packet 1048576
max-binlog-cache-size 18446744073709547520
max-binlog-cache-size 18446744073709547520
max-binlog-size 1073741824
max-binlog-size 1073741824
max-binlog-stmt-cache-size 18446744073709547520
max-binlog-stmt-cache-size 18446744073709547520
max-connect-errors 10
max-connect-errors 10
0
max-connections 151
max-connections 151
max-delayed-threads 20
max-delayed-threads 20
max-error-count 64
max-error-count 64
...
@@ -1057,6 +1083,7 @@ max-user-connections 0
...
@@ -1057,6 +1083,7 @@ max-user-connections 0
max-write-lock-count 18446744073709551615
max-write-lock-count 18446744073709551615
memlock FALSE
memlock FALSE
metadata-locks-cache-size 1024
metadata-locks-cache-size 1024
metadata-locks-hash-instances 8
min-examined-row-limit 0
min-examined-row-limit 0
mrr-buffer-size 262144
mrr-buffer-size 262144
multi-range-count 256
multi-range-count 256
...
@@ -1080,8 +1107,8 @@ old-style-user-limits FALSE
...
@@ -1080,8 +1107,8 @@ old-style-user-limits FALSE
optimizer-prune-level 1
optimizer-prune-level 1
optimizer-search-depth 62
optimizer-search-depth 62
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on
performance-schema
FALS
E
performance-schema
TRU
E
performance-schema-accounts-size 10
0
performance-schema-accounts-size 10
performance-schema-consumer-events-stages-current FALSE
performance-schema-consumer-events-stages-current FALSE
performance-schema-consumer-events-stages-history FALSE
performance-schema-consumer-events-stages-history FALSE
performance-schema-consumer-events-stages-history-long FALSE
performance-schema-consumer-events-stages-history-long FALSE
...
@@ -1094,35 +1121,36 @@ performance-schema-consumer-events-waits-history-long FALSE
...
@@ -1094,35 +1121,36 @@ performance-schema-consumer-events-waits-history-long FALSE
performance-schema-consumer-global-instrumentation TRUE
performance-schema-consumer-global-instrumentation TRUE
performance-schema-consumer-statements-digest TRUE
performance-schema-consumer-statements-digest TRUE
performance-schema-consumer-thread-instrumentation TRUE
performance-schema-consumer-thread-instrumentation TRUE
performance-schema-digests-size
2
00
performance-schema-digests-size
10
00
performance-schema-events-stages-history-long-size 100
00
performance-schema-events-stages-history-long-size 100
performance-schema-events-stages-history-size
10
performance-schema-events-stages-history-size
5
performance-schema-events-statements-history-long-size 100
00
performance-schema-events-statements-history-long-size 100
performance-schema-events-statements-history-size
10
performance-schema-events-statements-history-size
5
performance-schema-events-waits-history-long-size 100
00
performance-schema-events-waits-history-long-size 100
performance-schema-events-waits-history-size
10
performance-schema-events-waits-history-size
5
performance-schema-hosts-size
10
0
performance-schema-hosts-size
2
0
performance-schema-instrument
performance-schema-instrument
performance-schema-max-cond-classes 80
performance-schema-max-cond-classes 80
performance-schema-max-cond-instances
1000
performance-schema-max-cond-instances
836
performance-schema-max-file-classes 50
performance-schema-max-file-classes 50
performance-schema-max-file-handles 32768
performance-schema-max-file-handles 32768
performance-schema-max-file-instances 1
0000
performance-schema-max-file-instances 1
556
performance-schema-max-mutex-classes 200
performance-schema-max-mutex-classes 200
performance-schema-max-mutex-instances
1000000
performance-schema-max-mutex-instances
3282
performance-schema-max-rwlock-classes 30
performance-schema-max-rwlock-classes 30
performance-schema-max-rwlock-instances 1
000000
performance-schema-max-rwlock-instances 1
724
performance-schema-max-socket-classes 10
performance-schema-max-socket-classes 10
performance-schema-max-socket-instances 1
000
performance-schema-max-socket-instances 1
79
performance-schema-max-stage-classes 150
performance-schema-max-stage-classes 150
performance-schema-max-statement-classes 17
3
performance-schema-max-statement-classes 17
4
performance-schema-max-table-handles
10000
performance-schema-max-table-handles
445
performance-schema-max-table-instances
1000
performance-schema-max-table-instances
445
performance-schema-max-thread-classes 50
performance-schema-max-thread-classes 50
performance-schema-max-thread-instances 1000
performance-schema-max-thread-instances 224
performance-schema-session-connect-attrs-size 512
performance-schema-setup-actors-size 100
performance-schema-setup-actors-size 100
performance-schema-setup-objects-size 100
performance-schema-setup-objects-size 100
performance-schema-users-size
100
performance-schema-users-size
5
plugin-maturity unknown
plugin-maturity unknown
port 3306
port 3306
port-open-timeout 0
port-open-timeout 0
...
...
mysql-test/r/system_mysql_db.result
View file @
5b19ff65
...
@@ -14,15 +14,11 @@ host
...
@@ -14,15 +14,11 @@ host
index_stats
index_stats
innodb_index_stats
innodb_index_stats
innodb_table_stats
innodb_table_stats
ndb_binlog_index
plugin
plugin
proc
proc
procs_priv
procs_priv
proxies_priv
proxies_priv
servers
servers
slave_master_info
slave_relay_log_info
slave_worker_info
slow_log
slow_log
table_stats
table_stats
tables_priv
tables_priv
...
@@ -130,6 +126,7 @@ user CREATE TABLE `user` (
...
@@ -130,6 +126,7 @@ user CREATE TABLE `user` (
`max_user_connections` int(11) NOT NULL DEFAULT '0',
`max_user_connections` int(11) NOT NULL DEFAULT '0',
`plugin` char(64) CHARACTER SET latin1 NOT NULL DEFAULT '',
`plugin` char(64) CHARACTER SET latin1 NOT NULL DEFAULT '',
`authentication_string` text COLLATE utf8_bin NOT NULL,
`authentication_string` text COLLATE utf8_bin NOT NULL,
`password_expired` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
PRIMARY KEY (`Host`,`User`)
PRIMARY KEY (`Host`,`User`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
show create table func;
show create table func;
...
@@ -250,9 +247,9 @@ event CREATE TABLE `event` (
...
@@ -250,9 +247,9 @@ event CREATE TABLE `event` (
show create table general_log;
show create table general_log;
Table Create Table
Table Create Table
general_log CREATE TABLE `general_log` (
general_log CREATE TABLE `general_log` (
`event_time` timestamp
(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6)
,
`event_time` timestamp
NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
,
`user_host` mediumtext NOT NULL,
`user_host` mediumtext NOT NULL,
`thread_id`
int(11)
NOT NULL,
`thread_id`
bigint(21) unsigned
NOT NULL,
`server_id` int(10) unsigned NOT NULL,
`server_id` int(10) unsigned NOT NULL,
`command_type` varchar(64) NOT NULL,
`command_type` varchar(64) NOT NULL,
`argument` mediumtext NOT NULL
`argument` mediumtext NOT NULL
...
@@ -270,7 +267,8 @@ slow_log CREATE TABLE `slow_log` (
...
@@ -270,7 +267,8 @@ slow_log CREATE TABLE `slow_log` (
`last_insert_id` int(11) NOT NULL,
`last_insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL,
`insert_id` int(11) NOT NULL,
`server_id` int(10) unsigned NOT NULL,
`server_id` int(10) unsigned NOT NULL,
`sql_text` mediumtext NOT NULL
`sql_text` mediumtext NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log'
show create table table_stats;
show create table table_stats;
Table Create Table
Table Create Table
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment