create database `inf%`;
create database mbase;
diff -ruN a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
---- a/mysql-test/r/mysqld--help-notwin.result 2010-12-03 20:58:24.000000000 +0300
-+++ b/mysql-test/r/mysqld--help-notwin.result 2011-01-10 23:34:28.000000000 +0300
-@@ -125,6 +125,9 @@
- --div-precision-increment=#
- Precision of the result of '/' operator will be increased
- on that value
-+ --enable-query-response-time-stats
-+ Enable or disable query response time statisics
-+ collecting
- --engine-condition-pushdown
- Push supported query conditions to the storage engine.
- Deprecated, use --optimizer-switch instead.
-@@ -244,21 +247,43 @@
+--- a/mysql-test/r/mysqld--help-notwin.result 2011-01-20 00:37:09.000000000 +0200
++++ b/mysql-test/r/mysqld--help-notwin.result 2011-02-18 13:14:44.701736864 +0200
+@@ -249,21 +249,43 @@
--log-slow-admin-statements
Log slow OPTIMIZE, ANALYZE, ALTER and other
administrative statements to the slow log if it is open.
+ Choose how verbose the messages to your slow log will be.
+ Multiple flags allowed in a comma-separated string.
+ [microtime, query_plan, innodb, profiling,
-+ profiling_get_rusage]
++ profiling_use_getrusage]
--log-tc=name Path to transaction coordinator log (used for
transactions that affect more than one storage engine,
when binary log is disabled).
--long-query-time=# Log all queries that have taken more than long_query_time
seconds to execute to file. The argument will be treated
as a decimal value with microsecond precision
-@@ -464,6 +489,10 @@
+@@ -470,6 +492,10 @@
The minimum size for blocks allocated by the query cache
--query-cache-size=#
The memory allocated to store results from old queries
--query-cache-type=name
OFF = Don't cache or retrieve results. ON = Cache all
results except SELECT SQL_NO_CACHE ... queries. DEMAND =
-@@ -472,6 +501,9 @@
+@@ -478,6 +504,12 @@
Invalidate queries in query cache on LOCK for write
--query-prealloc-size=#
Persistent buffer for query parsing and execution
+ --query-response-time-range-base=#
+ Select base of log for query_response_time ranges.
+ WARNING: variable change affect only after flush
++ --query-response-time-stats
++ Enable or disable query response time statisics
++ collecting
--range-alloc-block-size=#
Allocation block size for storing ranges during
optimization
-@@ -649,6 +681,9 @@
+@@ -655,6 +687,9 @@
Log slow queries to given log file. Defaults logging to
hostname-slow.log. Must be enabled to activate other slow
log options
--socket=name Socket file to use for connection
--sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of
-@@ -691,6 +726,8 @@
+@@ -697,6 +732,8 @@
Define threads usage for handling queries, one of
one-thread-per-connection, no-threads, loaded-dynamically
--thread-stack=# The stack size for each thread
--time-format=name The TIME format (ignored)
--timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
currently supported)
-@@ -715,11 +752,24 @@
+@@ -721,11 +758,24 @@
Prohibit update of a VIEW, which does not contain a key
of the underlying table and the query uses a LIMIT clause
(usually get from GUI tools)
Variables (--variable-name=value)
abort-slave-event-count 0
-@@ -756,6 +806,7 @@
- delayed-queue-size 1000
- disconnect-slave-event-count 0
- div-precision-increment 4
-+enable-query-response-time-stats FALSE
- engine-condition-pushdown TRUE
- event-scheduler OFF
- expire-logs-days 0
-@@ -800,10 +851,16 @@
+@@ -807,10 +857,16 @@
log-short-format FALSE
log-slave-updates FALSE
log-slow-admin-statements FALSE
long-query-time 10
low-priority-updates FALSE
lower-case-table-names 1
-@@ -877,9 +934,11 @@
+@@ -885,9 +941,12 @@
query-cache-limit 1048576
query-cache-min-res-unit 4096
query-cache-size 0
query-cache-wlock-invalidate FALSE
query-prealloc-size 8192
+query-response-time-range-base 10
++query-response-time-stats FALSE
range-alloc-block-size 4096
read-buffer-size 131072
read-only FALSE
-@@ -914,6 +973,7 @@
+@@ -922,6 +981,7 @@
slave-type-conversions
slow-launch-time 2
slow-query-log FALSE
sort-buffer-size 2097152
sporadic-binlog-dump-fail FALSE
sql-mode
-@@ -931,6 +991,7 @@
+@@ -939,6 +999,7 @@
thread-cache-size 0
thread-handling one-thread-per-connection
thread-stack 262144
time-format %H:%i:%s
timed-mutexes FALSE
tmp-table-size 16777216
-@@ -938,8 +999,11 @@
+@@ -946,8 +1007,11 @@
transaction-isolation REPEATABLE-READ
transaction-prealloc-size 4096
updatable-views-with-limit YES
diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
--- a/mysql-test/suite/innodb/r/innodb.result 2010-11-03 07:01:12.000000000 +0900
+++ b/mysql-test/suite/innodb/r/innodb.result 2010-12-10 16:48:11.026994635 +0900
-@@ -1661,7 +1661,7 @@
+@@ -1664,7 +1664,7 @@
drop table t1;
SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
variable_value
variable_value
16384
diff -ruN a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
---- a/mysql-test/suite/sys_vars/r/all_vars.result 2010-12-03 20:58:25.000000000 +0300
-+++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-01-10 23:09:13.000000000 +0300
+--- a/mysql-test/suite/sys_vars/r/all_vars.result 2011-01-20 00:37:09.000000000 +0200
++++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-02-18 13:04:56.205855418 +0200
@@ -11,7 +11,99 @@
select variable_name as `There should be *no* variables listed below:` from t2
left join t1 on variable_name=test_name where test_name is null;
There should be *no* variables listed below:
-+INNODB_BUFFER_POOL_SHM_KEY
++QUERY_CACHE_STRIP_COMMENTS
+LOG_SLOW_SP_STATEMENTS
-+INNODB_DOUBLEWRITE_FILE
+INNODB_THREAD_CONCURRENCY_TIMER_BASED
+LOG_SLOW_TIMESTAMP_EVERY
++INNODB_LOG_BLOCK_SIZE
++THREAD_STATISTICS
+INNODB_READ_AHEAD
++INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
+INNODB_PASS_CORRUPT_TABLE
-+INNODB_RECOVERY_STATS
++QUERY_RESPONSE_TIME_STATS
+INNODB_FLUSH_NEIGHBOR_PAGES
+INNODB_BUFFER_POOL_SHM_CHECKSUM
-+INNODB_FLUSH_LOG_AT_TRX_COMMIT_SESSION
+LOG_SLOW_VERBOSITY
-+ENABLE_QUERY_RESPONSE_TIME_STATS
-+OPTIMIZER_FIX
-+INNODB_ADAPTIVE_CHECKPOINT
+INNODB_SHOW_LOCKS_HELD
+INNODB_IBUF_ACCEL_RATE
+INNODB_EXPAND_IMPORT
-+QUERY_CACHE_STRIP_COMMENTS
+INNODB_CHECKPOINT_AGE_TARGET
++INNODB_ADAPTIVE_FLUSHING_METHOD
+INNODB_STATS_METHOD
++HAVE_RESPONSE_TIME_DISTRIBUTION
+LOG_SLOW_RATE_LIMIT
++OPTIMIZER_FIX
+INNODB_PAGE_SIZE
-+USERSTAT_RUNNING
+FAST_INDEX_CREATION
+USE_GLOBAL_LOG_SLOW_CONTROL
-+INNODB_ENABLE_UNSAFE_GROUP_COMMIT
-+INNODB_SHOW_VERBOSE_LOCKS
++INNODB_IBUF_MAX_SIZE
+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP
-+INNODB_LOG_BLOCK_SIZE
++INNODB_BUFFER_POOL_SHM_KEY
++INNODB_FAST_CHECKSUM
+INNODB_USE_SYS_STATS_TABLE
+INNODB_STATS_UPDATE_NEED_LOCK
++INNODB_RECOVERY_STATS
++USERSTAT_RUNNING
+QUERY_RESPONSE_TIME_RANGE_BASE
-+INNODB_STATS_AUTO_UPDATE
+INNODB_IBUF_ACTIVE_CONTRACT
- INNODB_FILE_FORMAT_MAX
+INNODB_AUTO_LRU_DUMP
++INNODB_DOUBLEWRITE_FILE
++INNODB_STATS_AUTO_UPDATE
++INNODB_DICT_SIZE_LIMIT
+ INNODB_FILE_FORMAT_MAX
+LOG_WARNINGS_SILENCE
+LOG_SLOW_FILTER
-+INNODB_DICT_SIZE_LIMIT
-+INNODB_IBUF_MAX_SIZE
-+INNODB_FAST_CHECKSUM
-+LOG_SLOW_SLAVE_STATEMENTS
-+INNODB_OVERWRITE_RELAY_LOG_INFO
++INNODB_SHOW_VERBOSE_LOCKS
+INNODB_EXTRA_RSEGMENTS
-+THREAD_STATISTICS
-+INNODB_BUFFER_POOL_SHM_KEY
++INNODB_OVERWRITE_RELAY_LOG_INFO
++LOG_SLOW_SLAVE_STATEMENTS
++QUERY_CACHE_STRIP_COMMENTS
+LOG_SLOW_SP_STATEMENTS
-+INNODB_DOUBLEWRITE_FILE
+INNODB_THREAD_CONCURRENCY_TIMER_BASED
+LOG_SLOW_TIMESTAMP_EVERY
++INNODB_LOG_BLOCK_SIZE
++THREAD_STATISTICS
+INNODB_READ_AHEAD
++INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
+INNODB_PASS_CORRUPT_TABLE
-+INNODB_RECOVERY_STATS
++QUERY_RESPONSE_TIME_STATS
+INNODB_FLUSH_NEIGHBOR_PAGES
+INNODB_BUFFER_POOL_SHM_CHECKSUM
-+INNODB_FLUSH_LOG_AT_TRX_COMMIT_SESSION
+LOG_SLOW_VERBOSITY
-+ENABLE_QUERY_RESPONSE_TIME_STATS
-+OPTIMIZER_FIX
-+INNODB_ADAPTIVE_CHECKPOINT
+INNODB_SHOW_LOCKS_HELD
+INNODB_IBUF_ACCEL_RATE
+INNODB_EXPAND_IMPORT
-+QUERY_CACHE_STRIP_COMMENTS
+INNODB_CHECKPOINT_AGE_TARGET
++INNODB_ADAPTIVE_FLUSHING_METHOD
+INNODB_STATS_METHOD
++HAVE_RESPONSE_TIME_DISTRIBUTION
+LOG_SLOW_RATE_LIMIT
++OPTIMIZER_FIX
+INNODB_PAGE_SIZE
-+USERSTAT_RUNNING
+FAST_INDEX_CREATION
+USE_GLOBAL_LOG_SLOW_CONTROL
-+INNODB_ENABLE_UNSAFE_GROUP_COMMIT
-+INNODB_SHOW_VERBOSE_LOCKS
++INNODB_IBUF_MAX_SIZE
+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP
-+INNODB_LOG_BLOCK_SIZE
++INNODB_BUFFER_POOL_SHM_KEY
++INNODB_FAST_CHECKSUM
+INNODB_USE_SYS_STATS_TABLE
+INNODB_STATS_UPDATE_NEED_LOCK
++INNODB_RECOVERY_STATS
++USERSTAT_RUNNING
+QUERY_RESPONSE_TIME_RANGE_BASE
-+INNODB_STATS_AUTO_UPDATE
+INNODB_IBUF_ACTIVE_CONTRACT
- INNODB_FILE_FORMAT_MAX
+INNODB_AUTO_LRU_DUMP
++INNODB_DOUBLEWRITE_FILE
++INNODB_STATS_AUTO_UPDATE
++INNODB_DICT_SIZE_LIMIT
+ INNODB_FILE_FORMAT_MAX
+LOG_WARNINGS_SILENCE
+LOG_SLOW_FILTER
-+INNODB_DICT_SIZE_LIMIT
-+INNODB_IBUF_MAX_SIZE
-+INNODB_FAST_CHECKSUM
-+LOG_SLOW_SLAVE_STATEMENTS
-+INNODB_OVERWRITE_RELAY_LOG_INFO
++INNODB_SHOW_VERBOSE_LOCKS
+INNODB_EXTRA_RSEGMENTS
-+THREAD_STATISTICS
++INNODB_OVERWRITE_RELAY_LOG_INFO
++LOG_SLOW_SLAVE_STATEMENTS
drop table t1;
drop table t2;
diff -ruN a/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result
projects / packages / mysql.git / blobdiff