Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~longbow/percona-server/ps55_log_slow_rate_limit into lp:percona-server/5.5

  1. ps55_log_slow_rate_limit
  2. Merge into 5.5
Proposed by Valentine Gostev
Status: Rejected
Rejected by: Laurynas Biveinis
Proposed branch: lp:~longbow/percona-server/ps55_log_slow_rate_limit
Merge into: lp:percona-server/5.5
Diff against target: 878 lines (+853/-0) (has conflicts)
3 files modified
mysql-test/percona_server_variables_debug.result.OTHER (+371/-0)
mysql-test/percona_server_variables_release.result.OTHER (+368/-0)
patches/slow_extended.patch (+114/-0)
Conflict adding files to mysql-test.  Created directory.
Conflict because mysql-test is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mysql-test/percona_server_variables_debug.result
Contents conflict in mysql-test/percona_server_variables_release.result
Text conflict in patches/slow_extended.patch
To merge this branch: bzr merge lp:~longbow/percona-server/ps55_log_slow_rate_limit
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+87227@code.launchpad.net

Description of the change

Added test for log_slow_rate_limit variable

To post a comment you must log in.

Unmerged revisions

155. By Valentine Gostev

Added functional test for log_slow_rate_limit

154. By Valentine Gostev

Merging back recent changes from trunk

153. By longbow <longbow@mil-nb>

Added test for log_slow_rate_limit variable

152. By Stewart Smith

merge 5.5.15 rebase

151. By Stewart Smith

use S3 download site

150. By Stewart Smith

merge a few quilt related fixes to misc scripts we use

149. By Stewart Smith

merge atomic_cas_64 fix

148. By Stewart Smith

merge compiler warning fix for innodb comparison of unsigned expression always true

147. By Stewart Smith

merge fix of innodb_bug60049 test failure. The master thread should purge if purge_thread seems already exited in shutdown state.

146. By Stewart Smith

update percona_server_variables_debug.result for disabled INNODB_FAKE_CHANGES and KILL_IDLE_TRANSACTION

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'mysql-test'
=== added file 'mysql-test/percona_server_variables_debug.result.OTHER'
--- mysql-test/percona_server_variables_debug.result.OTHER 1970-01-01 00:00:00 +0000
+++ mysql-test/percona_server_variables_debug.result.OTHER 2012-01-02 07:35:43 +0000
@@ -0,0 +1,371 @@
1SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
2Variable_name
3AUTOCOMMIT
4AUTOMATIC_SP_PRIVILEGES
5AUTO_INCREMENT_INCREMENT
6AUTO_INCREMENT_OFFSET
7BACK_LOG
8BASEDIR
9BIG_TABLES
10BINLOG_CACHE_SIZE
11BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES
12BINLOG_FORMAT
13BINLOG_STMT_CACHE_SIZE
14BULK_INSERT_BUFFER_SIZE
15CHARACTER_SETS_DIR
16CHARACTER_SET_CLIENT
17CHARACTER_SET_CONNECTION
18CHARACTER_SET_DATABASE
19CHARACTER_SET_FILESYSTEM
20CHARACTER_SET_RESULTS
21CHARACTER_SET_SERVER
22CHARACTER_SET_SYSTEM
23COLLATION_CONNECTION
24COLLATION_DATABASE
25COLLATION_SERVER
26COMPLETION_TYPE
27CONCURRENT_INSERT
28CONNECT_TIMEOUT
29DATADIR
30DATETIME_FORMAT
31DATE_FORMAT
32DEBUG
33DEBUG_SYNC
34DEFAULT_STORAGE_ENGINE
35DEFAULT_WEEK_FORMAT
36DELAYED_INSERT_LIMIT
37DELAYED_INSERT_TIMEOUT
38DELAYED_QUEUE_SIZE
39DELAY_KEY_WRITE
40DIV_PRECISION_INCREMENT
41ENGINE_CONDITION_PUSHDOWN
42ERROR_COUNT
43EVENT_SCHEDULER
44EXPIRE_LOGS_DAYS
45EXTERNAL_USER
46FAST_INDEX_CREATION
47FLUSH
48FLUSH_TIME
49FOREIGN_KEY_CHECKS
50FT_BOOLEAN_SYNTAX
51FT_MAX_WORD_LEN
52FT_MIN_WORD_LEN
53FT_QUERY_EXPANSION_LIMIT
54FT_STOPWORD_FILE
55GENERAL_LOG
56GENERAL_LOG_FILE
57GROUP_CONCAT_MAX_LEN
58HAVE_COMPRESS
59HAVE_CRYPT
60HAVE_CSV
61HAVE_DYNAMIC_LOADING
62HAVE_GEOMETRY
63HAVE_INNODB
64HAVE_NDBCLUSTER
65HAVE_OPENSSL
66HAVE_PARTITIONING
67HAVE_PROFILING
68HAVE_QUERY_CACHE
69HAVE_RESPONSE_TIME_DISTRIBUTION
70HAVE_RTREE_KEYS
71HAVE_SSL
72HAVE_SYMLINK
73HOSTNAME
74IDENTITY
75IGNORE_BUILTIN_INNODB
76INIT_CONNECT
77INIT_FILE
78INIT_SLAVE
79INNODB_ADAPTIVE_FLUSHING
80INNODB_ADAPTIVE_FLUSHING_METHOD
81INNODB_ADAPTIVE_HASH_INDEX
82INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
83INNODB_ADDITIONAL_MEM_POOL_SIZE
84INNODB_AUTOEXTEND_INCREMENT
85INNODB_AUTOINC_LOCK_MODE
86INNODB_BUFFER_POOL_INSTANCES
87INNODB_BUFFER_POOL_RESTORE_AT_STARTUP
88INNODB_BUFFER_POOL_SHM_CHECKSUM
89INNODB_BUFFER_POOL_SHM_KEY
90INNODB_BUFFER_POOL_SIZE
91INNODB_CHANGE_BUFFERING
92INNODB_CHANGE_BUFFERING_DEBUG
93INNODB_CHECKPOINT_AGE_TARGET
94INNODB_CHECKSUMS
95INNODB_COMMIT_CONCURRENCY
96INNODB_CONCURRENCY_TICKETS
97INNODB_CORRUPT_TABLE_ACTION
98INNODB_DATA_FILE_PATH
99INNODB_DATA_HOME_DIR
100INNODB_DICT_SIZE_LIMIT
101INNODB_DOUBLEWRITE
102INNODB_DOUBLEWRITE_FILE
103INNODB_FAST_CHECKSUM
104INNODB_FAST_SHUTDOWN
105INNODB_FILE_FORMAT
106INNODB_FILE_FORMAT_CHECK
107INNODB_FILE_FORMAT_MAX
108INNODB_FILE_PER_TABLE
109INNODB_FLUSH_LOG_AT_TRX_COMMIT
110INNODB_FLUSH_METHOD
111INNODB_FLUSH_NEIGHBOR_PAGES
112INNODB_FORCE_RECOVERY
113INNODB_IBUF_ACCEL_RATE
114INNODB_IBUF_ACTIVE_CONTRACT
115INNODB_IBUF_MAX_SIZE
116INNODB_IMPORT_TABLE_FROM_XTRABACKUP
117INNODB_IO_CAPACITY
118INNODB_LARGE_PREFIX
119INNODB_LAZY_DROP_TABLE
120INNODB_LOCKS_UNSAFE_FOR_BINLOG
121INNODB_LOCK_WAIT_TIMEOUT
122INNODB_LOG_BLOCK_SIZE
123INNODB_LOG_BUFFER_SIZE
124INNODB_LOG_FILES_IN_GROUP
125INNODB_LOG_FILE_SIZE
126INNODB_LOG_GROUP_HOME_DIR
127INNODB_MAX_DIRTY_PAGES_PCT
128INNODB_MAX_PURGE_LAG
129INNODB_MIRRORED_LOG_GROUPS
130INNODB_OLD_BLOCKS_PCT
131INNODB_OLD_BLOCKS_TIME
132INNODB_OPEN_FILES
133INNODB_PAGE_SIZE
134INNODB_PURGE_BATCH_SIZE
135INNODB_PURGE_THREADS
136INNODB_READ_AHEAD
137INNODB_READ_AHEAD_THRESHOLD
138INNODB_READ_IO_THREADS
139INNODB_RECOVERY_STATS
140INNODB_RECOVERY_UPDATE_RELAY_LOG
141INNODB_REPLICATION_DELAY
142INNODB_ROLLBACK_ON_TIMEOUT
143INNODB_ROLLBACK_SEGMENTS
144INNODB_SHOW_LOCKS_HELD
145INNODB_SHOW_VERBOSE_LOCKS
146INNODB_SPIN_WAIT_DELAY
147INNODB_STATS_AUTO_UPDATE
148INNODB_STATS_METHOD
149INNODB_STATS_ON_METADATA
150INNODB_STATS_SAMPLE_PAGES
151INNODB_STATS_UPDATE_NEED_LOCK
152INNODB_STRICT_MODE
153INNODB_SUPPORT_XA
154INNODB_SYNC_SPIN_LOOPS
155INNODB_TABLE_LOCKS
156INNODB_THREAD_CONCURRENCY
157INNODB_THREAD_CONCURRENCY_TIMER_BASED
158INNODB_THREAD_SLEEP_DELAY
159INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
160INNODB_USE_NATIVE_AIO
161INNODB_USE_SYS_MALLOC
162INNODB_USE_SYS_STATS_TABLE
163INNODB_VERSION
164INNODB_WRITE_IO_THREADS
165INSERT_ID
166INTERACTIVE_TIMEOUT
167JOIN_BUFFER_SIZE
168KEEP_FILES_ON_CREATE
169KEY_BUFFER_SIZE
170KEY_CACHE_AGE_THRESHOLD
171KEY_CACHE_BLOCK_SIZE
172KEY_CACHE_DIVISION_LIMIT
173LARGE_FILES_SUPPORT
174LARGE_PAGES
175LARGE_PAGE_SIZE
176LAST_INSERT_ID
177LC_MESSAGES
178LC_MESSAGES_DIR
179LC_TIME_NAMES
180LICENSE
181LOCAL_INFILE
182LOCKED_IN_MEMORY
183LOCK_WAIT_TIMEOUT
184LOG
185LOG_BIN
186LOG_BIN_TRUST_FUNCTION_CREATORS
187LOG_ERROR
188LOG_OUTPUT
189LOG_QUERIES_NOT_USING_INDEXES
190LOG_SLAVE_UPDATES
191LOG_SLOW_FILTER
192LOG_SLOW_QUERIES
193LOG_SLOW_SLAVE_STATEMENTS
194LOG_SLOW_SP_STATEMENTS
195LOG_SLOW_VERBOSITY
196LOG_WARNINGS
197LOG_WARNINGS_SUPPRESS
198LONG_QUERY_TIME
199LOWER_CASE_FILE_SYSTEM
200LOWER_CASE_TABLE_NAMES
201LOW_PRIORITY_UPDATES
202MAX_ALLOWED_PACKET
203MAX_BINLOG_CACHE_SIZE
204MAX_BINLOG_SIZE
205MAX_BINLOG_STMT_CACHE_SIZE
206MAX_CONNECTIONS
207MAX_CONNECT_ERRORS
208MAX_DELAYED_THREADS
209MAX_ERROR_COUNT
210MAX_HEAP_TABLE_SIZE
211MAX_INSERT_DELAYED_THREADS
212MAX_JOIN_SIZE
213MAX_LENGTH_FOR_SORT_DATA
214MAX_LONG_DATA_SIZE
215MAX_PREPARED_STMT_COUNT
216MAX_RELAY_LOG_SIZE
217MAX_SEEKS_FOR_KEY
218MAX_SORT_LENGTH
219MAX_SP_RECURSION_DEPTH
220MAX_TMP_TABLES
221MAX_USER_CONNECTIONS
222MAX_WRITE_LOCK_COUNT
223MIN_EXAMINED_ROW_LIMIT
224MULTI_RANGE_COUNT
225MYISAM_DATA_POINTER_SIZE
226MYISAM_MAX_SORT_FILE_SIZE
227MYISAM_MMAP_SIZE
228MYISAM_RECOVER_OPTIONS
229MYISAM_REPAIR_THREADS
230MYISAM_SORT_BUFFER_SIZE
231MYISAM_STATS_METHOD
232MYISAM_USE_MMAP
233NET_BUFFER_LENGTH
234NET_READ_TIMEOUT
235NET_RETRY_COUNT
236NET_WRITE_TIMEOUT
237NEW
238OLD
239OLD_ALTER_TABLE
240OLD_PASSWORDS
241OPEN_FILES_LIMIT
242OPTIMIZER_FIX
243OPTIMIZER_PRUNE_LEVEL
244OPTIMIZER_SEARCH_DEPTH
245OPTIMIZER_SWITCH
246PERFORMANCE_SCHEMA
247PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE
248PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE
249PERFORMANCE_SCHEMA_MAX_COND_CLASSES
250PERFORMANCE_SCHEMA_MAX_COND_INSTANCES
251PERFORMANCE_SCHEMA_MAX_FILE_CLASSES
252PERFORMANCE_SCHEMA_MAX_FILE_HANDLES
253PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES
254PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES
255PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES
256PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES
257PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES
258PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES
259PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES
260PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES
261PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES
262PID_FILE
263PLUGIN_DIR
264PORT
265PRELOAD_BUFFER_SIZE
266PROFILING
267PROFILING_HISTORY_SIZE
268PROTOCOL_VERSION
269PROXY_USER
270PSEUDO_THREAD_ID
271QUERY_ALLOC_BLOCK_SIZE
272QUERY_CACHE_LIMIT
273QUERY_CACHE_MIN_RES_UNIT
274QUERY_CACHE_SIZE
275QUERY_CACHE_STRIP_COMMENTS
276QUERY_CACHE_TYPE
277QUERY_CACHE_WLOCK_INVALIDATE
278QUERY_PREALLOC_SIZE
279QUERY_RESPONSE_TIME_RANGE_BASE
280QUERY_RESPONSE_TIME_STATS
281RAND_SEED1
282RAND_SEED2
283RANGE_ALLOC_BLOCK_SIZE
284READ_BUFFER_SIZE
285READ_ONLY
286READ_RND_BUFFER_SIZE
287RELAY_LOG
288RELAY_LOG_INDEX
289RELAY_LOG_INFO_FILE
290RELAY_LOG_PURGE
291RELAY_LOG_RECOVERY
292RELAY_LOG_SPACE_LIMIT
293REPORT_HOST
294REPORT_PASSWORD
295REPORT_PORT
296REPORT_USER
297RPL_RECOVERY_RANK
298SECURE_AUTH
299SECURE_FILE_PRIV
300SERVER_ID
301SKIP_EXTERNAL_LOCKING
302SKIP_NAME_RESOLVE
303SKIP_NETWORKING
304SKIP_SHOW_DATABASE
305SLAVE_COMPRESSED_PROTOCOL
306SLAVE_EXEC_MODE
307SLAVE_LOAD_TMPDIR
308SLAVE_NET_TIMEOUT
309SLAVE_SKIP_ERRORS
310SLAVE_TRANSACTION_RETRIES
311SLAVE_TYPE_CONVERSIONS
312SLOW_LAUNCH_TIME
313SLOW_QUERY_LOG
314SLOW_QUERY_LOG_FILE
315SLOW_QUERY_LOG_TIMESTAMP_ALWAYS
316SLOW_QUERY_LOG_TIMESTAMP_PRECISION
317SLOW_QUERY_LOG_USE_GLOBAL_CONTROL
318SOCKET
319SORT_BUFFER_SIZE
320SQL_AUTO_IS_NULL
321SQL_BIG_SELECTS
322SQL_BIG_TABLES
323SQL_BUFFER_RESULT
324SQL_LOG_BIN
325SQL_LOG_OFF
326SQL_LOW_PRIORITY_UPDATES
327SQL_MAX_JOIN_SIZE
328SQL_MODE
329SQL_NOTES
330SQL_QUOTE_SHOW_CREATE
331SQL_SAFE_UPDATES
332SQL_SELECT_LIMIT
333SQL_SLAVE_SKIP_COUNTER
334SQL_WARNINGS
335SSL_CA
336SSL_CAPATH
337SSL_CERT
338SSL_CIPHER
339SSL_KEY
340STORAGE_ENGINE
341SYNC_BINLOG
342SYNC_FRM
343SYNC_MASTER_INFO
344SYNC_RELAY_LOG
345SYNC_RELAY_LOG_INFO
346SYSTEM_TIME_ZONE
347TABLE_DEFINITION_CACHE
348TABLE_OPEN_CACHE
349THREAD_CACHE_SIZE
350THREAD_CONCURRENCY
351THREAD_HANDLING
352THREAD_STACK
353THREAD_STATISTICS
354TIMED_MUTEXES
355TIMESTAMP
356TIME_FORMAT
357TIME_ZONE
358TMPDIR
359TMP_TABLE_SIZE
360TRANSACTION_ALLOC_BLOCK_SIZE
361TRANSACTION_PREALLOC_SIZE
362TX_ISOLATION
363UNIQUE_CHECKS
364UPDATABLE_VIEWS_WITH_LIMIT
365USERSTAT
366VERSION
367VERSION_COMMENT
368VERSION_COMPILE_MACHINE
369VERSION_COMPILE_OS
370WAIT_TIMEOUT
371WARNING_COUNT
0372
=== added file 'mysql-test/percona_server_variables_release.result.OTHER'
--- mysql-test/percona_server_variables_release.result.OTHER 1970-01-01 00:00:00 +0000
+++ mysql-test/percona_server_variables_release.result.OTHER 2012-01-02 07:35:43 +0000
@@ -0,0 +1,368 @@
1SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
2Variable_name
3AUTOCOMMIT
4AUTOMATIC_SP_PRIVILEGES
5AUTO_INCREMENT_INCREMENT
6AUTO_INCREMENT_OFFSET
7BACK_LOG
8BASEDIR
9BIG_TABLES
10BINLOG_CACHE_SIZE
11BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES
12BINLOG_FORMAT
13BINLOG_STMT_CACHE_SIZE
14BULK_INSERT_BUFFER_SIZE
15CHARACTER_SETS_DIR
16CHARACTER_SET_CLIENT
17CHARACTER_SET_CONNECTION
18CHARACTER_SET_DATABASE
19CHARACTER_SET_FILESYSTEM
20CHARACTER_SET_RESULTS
21CHARACTER_SET_SERVER
22CHARACTER_SET_SYSTEM
23COLLATION_CONNECTION
24COLLATION_DATABASE
25COLLATION_SERVER
26COMPLETION_TYPE
27CONCURRENT_INSERT
28CONNECT_TIMEOUT
29DATADIR
30DATETIME_FORMAT
31DATE_FORMAT
32DEFAULT_STORAGE_ENGINE
33DEFAULT_WEEK_FORMAT
34DELAYED_INSERT_LIMIT
35DELAYED_INSERT_TIMEOUT
36DELAYED_QUEUE_SIZE
37DELAY_KEY_WRITE
38DIV_PRECISION_INCREMENT
39ENGINE_CONDITION_PUSHDOWN
40ERROR_COUNT
41EVENT_SCHEDULER
42EXPIRE_LOGS_DAYS
43EXTERNAL_USER
44FAST_INDEX_CREATION
45FLUSH
46FLUSH_TIME
47FOREIGN_KEY_CHECKS
48FT_BOOLEAN_SYNTAX
49FT_MAX_WORD_LEN
50FT_MIN_WORD_LEN
51FT_QUERY_EXPANSION_LIMIT
52FT_STOPWORD_FILE
53GENERAL_LOG
54GENERAL_LOG_FILE
55GROUP_CONCAT_MAX_LEN
56HAVE_COMPRESS
57HAVE_CRYPT
58HAVE_CSV
59HAVE_DYNAMIC_LOADING
60HAVE_GEOMETRY
61HAVE_INNODB
62HAVE_NDBCLUSTER
63HAVE_OPENSSL
64HAVE_PARTITIONING
65HAVE_PROFILING
66HAVE_QUERY_CACHE
67HAVE_RESPONSE_TIME_DISTRIBUTION
68HAVE_RTREE_KEYS
69HAVE_SSL
70HAVE_SYMLINK
71HOSTNAME
72IDENTITY
73IGNORE_BUILTIN_INNODB
74INIT_CONNECT
75INIT_FILE
76INIT_SLAVE
77INNODB_ADAPTIVE_FLUSHING
78INNODB_ADAPTIVE_FLUSHING_METHOD
79INNODB_ADAPTIVE_HASH_INDEX
80INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
81INNODB_ADDITIONAL_MEM_POOL_SIZE
82INNODB_AUTOEXTEND_INCREMENT
83INNODB_AUTOINC_LOCK_MODE
84INNODB_BUFFER_POOL_INSTANCES
85INNODB_BUFFER_POOL_RESTORE_AT_STARTUP
86INNODB_BUFFER_POOL_SHM_CHECKSUM
87INNODB_BUFFER_POOL_SHM_KEY
88INNODB_BUFFER_POOL_SIZE
89INNODB_CHANGE_BUFFERING
90INNODB_CHECKPOINT_AGE_TARGET
91INNODB_CHECKSUMS
92INNODB_COMMIT_CONCURRENCY
93INNODB_CONCURRENCY_TICKETS
94INNODB_CORRUPT_TABLE_ACTION
95INNODB_DATA_FILE_PATH
96INNODB_DATA_HOME_DIR
97INNODB_DICT_SIZE_LIMIT
98INNODB_DOUBLEWRITE
99INNODB_DOUBLEWRITE_FILE
100INNODB_FAST_CHECKSUM
101INNODB_FAST_SHUTDOWN
102INNODB_FILE_FORMAT
103INNODB_FILE_FORMAT_CHECK
104INNODB_FILE_FORMAT_MAX
105INNODB_FILE_PER_TABLE
106INNODB_FLUSH_LOG_AT_TRX_COMMIT
107INNODB_FLUSH_METHOD
108INNODB_FLUSH_NEIGHBOR_PAGES
109INNODB_FORCE_RECOVERY
110INNODB_IBUF_ACCEL_RATE
111INNODB_IBUF_ACTIVE_CONTRACT
112INNODB_IBUF_MAX_SIZE
113INNODB_IMPORT_TABLE_FROM_XTRABACKUP
114INNODB_IO_CAPACITY
115INNODB_LARGE_PREFIX
116INNODB_LAZY_DROP_TABLE
117INNODB_LOCKS_UNSAFE_FOR_BINLOG
118INNODB_LOCK_WAIT_TIMEOUT
119INNODB_LOG_BLOCK_SIZE
120INNODB_LOG_BUFFER_SIZE
121INNODB_LOG_FILES_IN_GROUP
122INNODB_LOG_FILE_SIZE
123INNODB_LOG_GROUP_HOME_DIR
124INNODB_MAX_DIRTY_PAGES_PCT
125INNODB_MAX_PURGE_LAG
126INNODB_MIRRORED_LOG_GROUPS
127INNODB_OLD_BLOCKS_PCT
128INNODB_OLD_BLOCKS_TIME
129INNODB_OPEN_FILES
130INNODB_PAGE_SIZE
131INNODB_PURGE_BATCH_SIZE
132INNODB_PURGE_THREADS
133INNODB_READ_AHEAD
134INNODB_READ_AHEAD_THRESHOLD
135INNODB_READ_IO_THREADS
136INNODB_RECOVERY_STATS
137INNODB_RECOVERY_UPDATE_RELAY_LOG
138INNODB_REPLICATION_DELAY
139INNODB_ROLLBACK_ON_TIMEOUT
140INNODB_ROLLBACK_SEGMENTS
141INNODB_SHOW_LOCKS_HELD
142INNODB_SHOW_VERBOSE_LOCKS
143INNODB_SPIN_WAIT_DELAY
144INNODB_STATS_AUTO_UPDATE
145INNODB_STATS_METHOD
146INNODB_STATS_ON_METADATA
147INNODB_STATS_SAMPLE_PAGES
148INNODB_STATS_UPDATE_NEED_LOCK
149INNODB_STRICT_MODE
150INNODB_SUPPORT_XA
151INNODB_SYNC_SPIN_LOOPS
152INNODB_TABLE_LOCKS
153INNODB_THREAD_CONCURRENCY
154INNODB_THREAD_CONCURRENCY_TIMER_BASED
155INNODB_THREAD_SLEEP_DELAY
156INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
157INNODB_USE_NATIVE_AIO
158INNODB_USE_SYS_MALLOC
159INNODB_USE_SYS_STATS_TABLE
160INNODB_VERSION
161INNODB_WRITE_IO_THREADS
162INSERT_ID
163INTERACTIVE_TIMEOUT
164JOIN_BUFFER_SIZE
165KEEP_FILES_ON_CREATE
166KEY_BUFFER_SIZE
167KEY_CACHE_AGE_THRESHOLD
168KEY_CACHE_BLOCK_SIZE
169KEY_CACHE_DIVISION_LIMIT
170LARGE_FILES_SUPPORT
171LARGE_PAGES
172LARGE_PAGE_SIZE
173LAST_INSERT_ID
174LC_MESSAGES
175LC_MESSAGES_DIR
176LC_TIME_NAMES
177LICENSE
178LOCAL_INFILE
179LOCKED_IN_MEMORY
180LOCK_WAIT_TIMEOUT
181LOG
182LOG_BIN
183LOG_BIN_TRUST_FUNCTION_CREATORS
184LOG_ERROR
185LOG_OUTPUT
186LOG_QUERIES_NOT_USING_INDEXES
187LOG_SLAVE_UPDATES
188LOG_SLOW_FILTER
189LOG_SLOW_QUERIES
190LOG_SLOW_SLAVE_STATEMENTS
191LOG_SLOW_SP_STATEMENTS
192LOG_SLOW_VERBOSITY
193LOG_WARNINGS
194LOG_WARNINGS_SUPPRESS
195LONG_QUERY_TIME
196LOWER_CASE_FILE_SYSTEM
197LOWER_CASE_TABLE_NAMES
198LOW_PRIORITY_UPDATES
199MAX_ALLOWED_PACKET
200MAX_BINLOG_CACHE_SIZE
201MAX_BINLOG_SIZE
202MAX_BINLOG_STMT_CACHE_SIZE
203MAX_CONNECTIONS
204MAX_CONNECT_ERRORS
205MAX_DELAYED_THREADS
206MAX_ERROR_COUNT
207MAX_HEAP_TABLE_SIZE
208MAX_INSERT_DELAYED_THREADS
209MAX_JOIN_SIZE
210MAX_LENGTH_FOR_SORT_DATA
211MAX_LONG_DATA_SIZE
212MAX_PREPARED_STMT_COUNT
213MAX_RELAY_LOG_SIZE
214MAX_SEEKS_FOR_KEY
215MAX_SORT_LENGTH
216MAX_SP_RECURSION_DEPTH
217MAX_TMP_TABLES
218MAX_USER_CONNECTIONS
219MAX_WRITE_LOCK_COUNT
220MIN_EXAMINED_ROW_LIMIT
221MULTI_RANGE_COUNT
222MYISAM_DATA_POINTER_SIZE
223MYISAM_MAX_SORT_FILE_SIZE
224MYISAM_MMAP_SIZE
225MYISAM_RECOVER_OPTIONS
226MYISAM_REPAIR_THREADS
227MYISAM_SORT_BUFFER_SIZE
228MYISAM_STATS_METHOD
229MYISAM_USE_MMAP
230NET_BUFFER_LENGTH
231NET_READ_TIMEOUT
232NET_RETRY_COUNT
233NET_WRITE_TIMEOUT
234NEW
235OLD
236OLD_ALTER_TABLE
237OLD_PASSWORDS
238OPEN_FILES_LIMIT
239OPTIMIZER_FIX
240OPTIMIZER_PRUNE_LEVEL
241OPTIMIZER_SEARCH_DEPTH
242OPTIMIZER_SWITCH
243PERFORMANCE_SCHEMA
244PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE
245PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE
246PERFORMANCE_SCHEMA_MAX_COND_CLASSES
247PERFORMANCE_SCHEMA_MAX_COND_INSTANCES
248PERFORMANCE_SCHEMA_MAX_FILE_CLASSES
249PERFORMANCE_SCHEMA_MAX_FILE_HANDLES
250PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES
251PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES
252PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES
253PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES
254PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES
255PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES
256PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES
257PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES
258PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES
259PID_FILE
260PLUGIN_DIR
261PORT
262PRELOAD_BUFFER_SIZE
263PROFILING
264PROFILING_HISTORY_SIZE
265PROTOCOL_VERSION
266PROXY_USER
267PSEUDO_THREAD_ID
268QUERY_ALLOC_BLOCK_SIZE
269QUERY_CACHE_LIMIT
270QUERY_CACHE_MIN_RES_UNIT
271QUERY_CACHE_SIZE
272QUERY_CACHE_STRIP_COMMENTS
273QUERY_CACHE_TYPE
274QUERY_CACHE_WLOCK_INVALIDATE
275QUERY_PREALLOC_SIZE
276QUERY_RESPONSE_TIME_RANGE_BASE
277QUERY_RESPONSE_TIME_STATS
278RAND_SEED1
279RAND_SEED2
280RANGE_ALLOC_BLOCK_SIZE
281READ_BUFFER_SIZE
282READ_ONLY
283READ_RND_BUFFER_SIZE
284RELAY_LOG
285RELAY_LOG_INDEX
286RELAY_LOG_INFO_FILE
287RELAY_LOG_PURGE
288RELAY_LOG_RECOVERY
289RELAY_LOG_SPACE_LIMIT
290REPORT_HOST
291REPORT_PASSWORD
292REPORT_PORT
293REPORT_USER
294RPL_RECOVERY_RANK
295SECURE_AUTH
296SECURE_FILE_PRIV
297SERVER_ID
298SKIP_EXTERNAL_LOCKING
299SKIP_NAME_RESOLVE
300SKIP_NETWORKING
301SKIP_SHOW_DATABASE
302SLAVE_COMPRESSED_PROTOCOL
303SLAVE_EXEC_MODE
304SLAVE_LOAD_TMPDIR
305SLAVE_NET_TIMEOUT
306SLAVE_SKIP_ERRORS
307SLAVE_TRANSACTION_RETRIES
308SLAVE_TYPE_CONVERSIONS
309SLOW_LAUNCH_TIME
310SLOW_QUERY_LOG
311SLOW_QUERY_LOG_FILE
312SLOW_QUERY_LOG_TIMESTAMP_ALWAYS
313SLOW_QUERY_LOG_TIMESTAMP_PRECISION
314SLOW_QUERY_LOG_USE_GLOBAL_CONTROL
315SOCKET
316SORT_BUFFER_SIZE
317SQL_AUTO_IS_NULL
318SQL_BIG_SELECTS
319SQL_BIG_TABLES
320SQL_BUFFER_RESULT
321SQL_LOG_BIN
322SQL_LOG_OFF
323SQL_LOW_PRIORITY_UPDATES
324SQL_MAX_JOIN_SIZE
325SQL_MODE
326SQL_NOTES
327SQL_QUOTE_SHOW_CREATE
328SQL_SAFE_UPDATES
329SQL_SELECT_LIMIT
330SQL_SLAVE_SKIP_COUNTER
331SQL_WARNINGS
332SSL_CA
333SSL_CAPATH
334SSL_CERT
335SSL_CIPHER
336SSL_KEY
337STORAGE_ENGINE
338SYNC_BINLOG
339SYNC_FRM
340SYNC_MASTER_INFO
341SYNC_RELAY_LOG
342SYNC_RELAY_LOG_INFO
343SYSTEM_TIME_ZONE
344TABLE_DEFINITION_CACHE
345TABLE_OPEN_CACHE
346THREAD_CACHE_SIZE
347THREAD_CONCURRENCY
348THREAD_HANDLING
349THREAD_STACK
350THREAD_STATISTICS
351TIMED_MUTEXES
352TIMESTAMP
353TIME_FORMAT
354TIME_ZONE
355TMPDIR
356TMP_TABLE_SIZE
357TRANSACTION_ALLOC_BLOCK_SIZE
358TRANSACTION_PREALLOC_SIZE
359TX_ISOLATION
360UNIQUE_CHECKS
361UPDATABLE_VIEWS_WITH_LIMIT
362USERSTAT
363VERSION
364VERSION_COMMENT
365VERSION_COMPILE_MACHINE
366VERSION_COMPILE_OS
367WAIT_TIMEOUT
368WARNING_COUNT
0369
=== modified file 'patches/slow_extended.patch'
--- patches/slow_extended.patch 2011-12-13 15:06:50 +0000
+++ patches/slow_extended.patch 2012-01-02 07:35:43 +0000
@@ -1474,6 +1474,7 @@
1474 };1474 };
1475 1475
1476 # endif /* HAVE_PROFILING */1476 # endif /* HAVE_PROFILING */
1477<<<<<<< TREE
1477--- /dev/null1478--- /dev/null
1478+++ b/mysql-test/include/log_grep.inc1479+++ b/mysql-test/include/log_grep.inc
1479@@ -0,0 +1,17 @@1480@@ -0,0 +1,17 @@
@@ -2770,3 +2771,116 @@
2770 sort-buffer-size 20971522771 sort-buffer-size 2097152
2771 sporadic-binlog-dump-fail FALSE2772 sporadic-binlog-dump-fail FALSE
2772 sql-mode 2773 sql-mode
2774=======
2775--- /dev/null
2776+++ b/mysql-test/include/percona_log_slow_rate_limit_show.inc
2777@@ -0,0 +1,4 @@
2778+SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
2779+SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
2780+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2781+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2782--- /dev/null
2783+++ b/mysql-test/r/percona_log_slow_rate_limit.result
2784@@ -0,0 +1,43 @@
2785+SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
2786+Variable_name Value
2787+log_slow_rate_limit 1
2788+SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
2789+Variable_name Value
2790+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2791+VARIABLE_NAME VARIABLE_VALUE
2792+LOG_SLOW_RATE_LIMIT 1
2793+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2794+VARIABLE_NAME VARIABLE_VALUE
2795+SET GLOBAL log_slow_rate_limit=2;
2796+SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
2797+Variable_name Value
2798+log_slow_rate_limit 2
2799+SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
2800+Variable_name Value
2801+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2802+VARIABLE_NAME VARIABLE_VALUE
2803+LOG_SLOW_RATE_LIMIT 2
2804+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2805+VARIABLE_NAME VARIABLE_VALUE
2806+SET GLOBAL log_slow_rate_limit=100;
2807+SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
2808+Variable_name Value
2809+log_slow_rate_limit 100
2810+SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
2811+Variable_name Value
2812+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2813+VARIABLE_NAME VARIABLE_VALUE
2814+LOG_SLOW_RATE_LIMIT 100
2815+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2816+VARIABLE_NAME VARIABLE_VALUE
2817+SET GLOBAL log_slow_rate_limit=default;
2818+SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
2819+Variable_name Value
2820+log_slow_rate_limit 1
2821+SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
2822+Variable_name Value
2823+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2824+VARIABLE_NAME VARIABLE_VALUE
2825+LOG_SLOW_RATE_LIMIT 1
2826+SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
2827+VARIABLE_NAME VARIABLE_VALUE
2828--- /dev/null
2829+++ b/mysql-test/t/percona_log_slow_rate_limit.test
2830@@ -0,0 +1,7 @@
2831+--source include/percona_log_slow_rate_limit_show.inc
2832+SET GLOBAL log_slow_rate_limit=2;
2833+--source include/percona_log_slow_rate_limit_show.inc
2834+SET GLOBAL log_slow_rate_limit=100;
2835+--source include/percona_log_slow_rate_limit_show.inc
2836+SET GLOBAL log_slow_rate_limit=default;
2837+--source include/percona_log_slow_rate_limit_show.inc
2838--- /dev/null
2839+++ b/mysql-test/r/percona_log_slow_rate_limit_check.result
2840@@ -0,0 +1,16 @@
2841+DROP TABLE IF EXISTS t1;
2842+CREATE TABLE t1 (a INT);
2843+INSERT INTO t1 VALUES (123);
2844+SET GLOBAL slow_query_log_use_global_control='long_query_time';
2845+SET GLOBAL long_query_time=0;
2846+SET GLOBAL log_slow_rate_limit=2;
2847+[log_start.inc] percona_log_slow_rate_limit_check_slowlog
2848+SELECT COUNT(*) FROM t1;
2849+COUNT(*)
2850+1
2851+SELECT COUNT(*) FROM t1;
2852+COUNT(*)
2853+1
2854+[log_stop.inc] percona_log_slow_rate_limit_check_slowlog
2855+[log_grep.inc] file: percona_log_slow_rate_limit_check_slowlog pattern: SELECT COUNT
2856+[log_grep.inc] lines: 1
2857--- /dev/null
2858+++ b/mysql-test/t/percona_log_slow_rate_limit_check.test
2859@@ -0,0 +1,26 @@
2860+--let log_file=percona_log_slow_rate_limit_check_slowlog
2861+--disable_warnings
2862+DROP TABLE IF EXISTS t1;
2863+--enable_warnings
2864+
2865+CREATE TABLE t1 (a INT);
2866+INSERT INTO t1 VALUES (123);
2867+SET GLOBAL slow_query_log_use_global_control='long_query_time';
2868+SET GLOBAL long_query_time=0;
2869+SET GLOBAL log_slow_rate_limit=2;
2870+--source include/log_start.inc
2871+connect (conn1,localhost,root,,);
2872+connect (conn2,localhost,root,,);
2873+connection conn1;
2874+SELECT COUNT(*) FROM t1;
2875+connection conn2;
2876+SELECT COUNT(*) FROM t1;
2877+connection default;
2878+--source include/log_stop.inc
2879+
2880+--let grep_pattern = SELECT COUNT
2881+--source include/log_grep.inc
2882+DROP TABLE t1;
2883+SET GLOBAL slow_query_log_use_global_control=default;
2884+SET GLOBAL long_query_time=default;
2885+SET GLOBAL log_slow_rate_limit=default;
2886>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches