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
1=== added directory 'mysql-test'
2=== added file 'mysql-test/percona_server_variables_debug.result.OTHER'
3--- mysql-test/percona_server_variables_debug.result.OTHER 1970-01-01 00:00:00 +0000
4+++ mysql-test/percona_server_variables_debug.result.OTHER 2012-01-02 07:35:43 +0000
5@@ -0,0 +1,371 @@
6+SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
7+Variable_name
8+AUTOCOMMIT
9+AUTOMATIC_SP_PRIVILEGES
10+AUTO_INCREMENT_INCREMENT
11+AUTO_INCREMENT_OFFSET
12+BACK_LOG
13+BASEDIR
14+BIG_TABLES
15+BINLOG_CACHE_SIZE
16+BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES
17+BINLOG_FORMAT
18+BINLOG_STMT_CACHE_SIZE
19+BULK_INSERT_BUFFER_SIZE
20+CHARACTER_SETS_DIR
21+CHARACTER_SET_CLIENT
22+CHARACTER_SET_CONNECTION
23+CHARACTER_SET_DATABASE
24+CHARACTER_SET_FILESYSTEM
25+CHARACTER_SET_RESULTS
26+CHARACTER_SET_SERVER
27+CHARACTER_SET_SYSTEM
28+COLLATION_CONNECTION
29+COLLATION_DATABASE
30+COLLATION_SERVER
31+COMPLETION_TYPE
32+CONCURRENT_INSERT
33+CONNECT_TIMEOUT
34+DATADIR
35+DATETIME_FORMAT
36+DATE_FORMAT
37+DEBUG
38+DEBUG_SYNC
39+DEFAULT_STORAGE_ENGINE
40+DEFAULT_WEEK_FORMAT
41+DELAYED_INSERT_LIMIT
42+DELAYED_INSERT_TIMEOUT
43+DELAYED_QUEUE_SIZE
44+DELAY_KEY_WRITE
45+DIV_PRECISION_INCREMENT
46+ENGINE_CONDITION_PUSHDOWN
47+ERROR_COUNT
48+EVENT_SCHEDULER
49+EXPIRE_LOGS_DAYS
50+EXTERNAL_USER
51+FAST_INDEX_CREATION
52+FLUSH
53+FLUSH_TIME
54+FOREIGN_KEY_CHECKS
55+FT_BOOLEAN_SYNTAX
56+FT_MAX_WORD_LEN
57+FT_MIN_WORD_LEN
58+FT_QUERY_EXPANSION_LIMIT
59+FT_STOPWORD_FILE
60+GENERAL_LOG
61+GENERAL_LOG_FILE
62+GROUP_CONCAT_MAX_LEN
63+HAVE_COMPRESS
64+HAVE_CRYPT
65+HAVE_CSV
66+HAVE_DYNAMIC_LOADING
67+HAVE_GEOMETRY
68+HAVE_INNODB
69+HAVE_NDBCLUSTER
70+HAVE_OPENSSL
71+HAVE_PARTITIONING
72+HAVE_PROFILING
73+HAVE_QUERY_CACHE
74+HAVE_RESPONSE_TIME_DISTRIBUTION
75+HAVE_RTREE_KEYS
76+HAVE_SSL
77+HAVE_SYMLINK
78+HOSTNAME
79+IDENTITY
80+IGNORE_BUILTIN_INNODB
81+INIT_CONNECT
82+INIT_FILE
83+INIT_SLAVE
84+INNODB_ADAPTIVE_FLUSHING
85+INNODB_ADAPTIVE_FLUSHING_METHOD
86+INNODB_ADAPTIVE_HASH_INDEX
87+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
88+INNODB_ADDITIONAL_MEM_POOL_SIZE
89+INNODB_AUTOEXTEND_INCREMENT
90+INNODB_AUTOINC_LOCK_MODE
91+INNODB_BUFFER_POOL_INSTANCES
92+INNODB_BUFFER_POOL_RESTORE_AT_STARTUP
93+INNODB_BUFFER_POOL_SHM_CHECKSUM
94+INNODB_BUFFER_POOL_SHM_KEY
95+INNODB_BUFFER_POOL_SIZE
96+INNODB_CHANGE_BUFFERING
97+INNODB_CHANGE_BUFFERING_DEBUG
98+INNODB_CHECKPOINT_AGE_TARGET
99+INNODB_CHECKSUMS
100+INNODB_COMMIT_CONCURRENCY
101+INNODB_CONCURRENCY_TICKETS
102+INNODB_CORRUPT_TABLE_ACTION
103+INNODB_DATA_FILE_PATH
104+INNODB_DATA_HOME_DIR
105+INNODB_DICT_SIZE_LIMIT
106+INNODB_DOUBLEWRITE
107+INNODB_DOUBLEWRITE_FILE
108+INNODB_FAST_CHECKSUM
109+INNODB_FAST_SHUTDOWN
110+INNODB_FILE_FORMAT
111+INNODB_FILE_FORMAT_CHECK
112+INNODB_FILE_FORMAT_MAX
113+INNODB_FILE_PER_TABLE
114+INNODB_FLUSH_LOG_AT_TRX_COMMIT
115+INNODB_FLUSH_METHOD
116+INNODB_FLUSH_NEIGHBOR_PAGES
117+INNODB_FORCE_RECOVERY
118+INNODB_IBUF_ACCEL_RATE
119+INNODB_IBUF_ACTIVE_CONTRACT
120+INNODB_IBUF_MAX_SIZE
121+INNODB_IMPORT_TABLE_FROM_XTRABACKUP
122+INNODB_IO_CAPACITY
123+INNODB_LARGE_PREFIX
124+INNODB_LAZY_DROP_TABLE
125+INNODB_LOCKS_UNSAFE_FOR_BINLOG
126+INNODB_LOCK_WAIT_TIMEOUT
127+INNODB_LOG_BLOCK_SIZE
128+INNODB_LOG_BUFFER_SIZE
129+INNODB_LOG_FILES_IN_GROUP
130+INNODB_LOG_FILE_SIZE
131+INNODB_LOG_GROUP_HOME_DIR
132+INNODB_MAX_DIRTY_PAGES_PCT
133+INNODB_MAX_PURGE_LAG
134+INNODB_MIRRORED_LOG_GROUPS
135+INNODB_OLD_BLOCKS_PCT
136+INNODB_OLD_BLOCKS_TIME
137+INNODB_OPEN_FILES
138+INNODB_PAGE_SIZE
139+INNODB_PURGE_BATCH_SIZE
140+INNODB_PURGE_THREADS
141+INNODB_READ_AHEAD
142+INNODB_READ_AHEAD_THRESHOLD
143+INNODB_READ_IO_THREADS
144+INNODB_RECOVERY_STATS
145+INNODB_RECOVERY_UPDATE_RELAY_LOG
146+INNODB_REPLICATION_DELAY
147+INNODB_ROLLBACK_ON_TIMEOUT
148+INNODB_ROLLBACK_SEGMENTS
149+INNODB_SHOW_LOCKS_HELD
150+INNODB_SHOW_VERBOSE_LOCKS
151+INNODB_SPIN_WAIT_DELAY
152+INNODB_STATS_AUTO_UPDATE
153+INNODB_STATS_METHOD
154+INNODB_STATS_ON_METADATA
155+INNODB_STATS_SAMPLE_PAGES
156+INNODB_STATS_UPDATE_NEED_LOCK
157+INNODB_STRICT_MODE
158+INNODB_SUPPORT_XA
159+INNODB_SYNC_SPIN_LOOPS
160+INNODB_TABLE_LOCKS
161+INNODB_THREAD_CONCURRENCY
162+INNODB_THREAD_CONCURRENCY_TIMER_BASED
163+INNODB_THREAD_SLEEP_DELAY
164+INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
165+INNODB_USE_NATIVE_AIO
166+INNODB_USE_SYS_MALLOC
167+INNODB_USE_SYS_STATS_TABLE
168+INNODB_VERSION
169+INNODB_WRITE_IO_THREADS
170+INSERT_ID
171+INTERACTIVE_TIMEOUT
172+JOIN_BUFFER_SIZE
173+KEEP_FILES_ON_CREATE
174+KEY_BUFFER_SIZE
175+KEY_CACHE_AGE_THRESHOLD
176+KEY_CACHE_BLOCK_SIZE
177+KEY_CACHE_DIVISION_LIMIT
178+LARGE_FILES_SUPPORT
179+LARGE_PAGES
180+LARGE_PAGE_SIZE
181+LAST_INSERT_ID
182+LC_MESSAGES
183+LC_MESSAGES_DIR
184+LC_TIME_NAMES
185+LICENSE
186+LOCAL_INFILE
187+LOCKED_IN_MEMORY
188+LOCK_WAIT_TIMEOUT
189+LOG
190+LOG_BIN
191+LOG_BIN_TRUST_FUNCTION_CREATORS
192+LOG_ERROR
193+LOG_OUTPUT
194+LOG_QUERIES_NOT_USING_INDEXES
195+LOG_SLAVE_UPDATES
196+LOG_SLOW_FILTER
197+LOG_SLOW_QUERIES
198+LOG_SLOW_SLAVE_STATEMENTS
199+LOG_SLOW_SP_STATEMENTS
200+LOG_SLOW_VERBOSITY
201+LOG_WARNINGS
202+LOG_WARNINGS_SUPPRESS
203+LONG_QUERY_TIME
204+LOWER_CASE_FILE_SYSTEM
205+LOWER_CASE_TABLE_NAMES
206+LOW_PRIORITY_UPDATES
207+MAX_ALLOWED_PACKET
208+MAX_BINLOG_CACHE_SIZE
209+MAX_BINLOG_SIZE
210+MAX_BINLOG_STMT_CACHE_SIZE
211+MAX_CONNECTIONS
212+MAX_CONNECT_ERRORS
213+MAX_DELAYED_THREADS
214+MAX_ERROR_COUNT
215+MAX_HEAP_TABLE_SIZE
216+MAX_INSERT_DELAYED_THREADS
217+MAX_JOIN_SIZE
218+MAX_LENGTH_FOR_SORT_DATA
219+MAX_LONG_DATA_SIZE
220+MAX_PREPARED_STMT_COUNT
221+MAX_RELAY_LOG_SIZE
222+MAX_SEEKS_FOR_KEY
223+MAX_SORT_LENGTH
224+MAX_SP_RECURSION_DEPTH
225+MAX_TMP_TABLES
226+MAX_USER_CONNECTIONS
227+MAX_WRITE_LOCK_COUNT
228+MIN_EXAMINED_ROW_LIMIT
229+MULTI_RANGE_COUNT
230+MYISAM_DATA_POINTER_SIZE
231+MYISAM_MAX_SORT_FILE_SIZE
232+MYISAM_MMAP_SIZE
233+MYISAM_RECOVER_OPTIONS
234+MYISAM_REPAIR_THREADS
235+MYISAM_SORT_BUFFER_SIZE
236+MYISAM_STATS_METHOD
237+MYISAM_USE_MMAP
238+NET_BUFFER_LENGTH
239+NET_READ_TIMEOUT
240+NET_RETRY_COUNT
241+NET_WRITE_TIMEOUT
242+NEW
243+OLD
244+OLD_ALTER_TABLE
245+OLD_PASSWORDS
246+OPEN_FILES_LIMIT
247+OPTIMIZER_FIX
248+OPTIMIZER_PRUNE_LEVEL
249+OPTIMIZER_SEARCH_DEPTH
250+OPTIMIZER_SWITCH
251+PERFORMANCE_SCHEMA
252+PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE
253+PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE
254+PERFORMANCE_SCHEMA_MAX_COND_CLASSES
255+PERFORMANCE_SCHEMA_MAX_COND_INSTANCES
256+PERFORMANCE_SCHEMA_MAX_FILE_CLASSES
257+PERFORMANCE_SCHEMA_MAX_FILE_HANDLES
258+PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES
259+PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES
260+PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES
261+PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES
262+PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES
263+PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES
264+PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES
265+PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES
266+PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES
267+PID_FILE
268+PLUGIN_DIR
269+PORT
270+PRELOAD_BUFFER_SIZE
271+PROFILING
272+PROFILING_HISTORY_SIZE
273+PROTOCOL_VERSION
274+PROXY_USER
275+PSEUDO_THREAD_ID
276+QUERY_ALLOC_BLOCK_SIZE
277+QUERY_CACHE_LIMIT
278+QUERY_CACHE_MIN_RES_UNIT
279+QUERY_CACHE_SIZE
280+QUERY_CACHE_STRIP_COMMENTS
281+QUERY_CACHE_TYPE
282+QUERY_CACHE_WLOCK_INVALIDATE
283+QUERY_PREALLOC_SIZE
284+QUERY_RESPONSE_TIME_RANGE_BASE
285+QUERY_RESPONSE_TIME_STATS
286+RAND_SEED1
287+RAND_SEED2
288+RANGE_ALLOC_BLOCK_SIZE
289+READ_BUFFER_SIZE
290+READ_ONLY
291+READ_RND_BUFFER_SIZE
292+RELAY_LOG
293+RELAY_LOG_INDEX
294+RELAY_LOG_INFO_FILE
295+RELAY_LOG_PURGE
296+RELAY_LOG_RECOVERY
297+RELAY_LOG_SPACE_LIMIT
298+REPORT_HOST
299+REPORT_PASSWORD
300+REPORT_PORT
301+REPORT_USER
302+RPL_RECOVERY_RANK
303+SECURE_AUTH
304+SECURE_FILE_PRIV
305+SERVER_ID
306+SKIP_EXTERNAL_LOCKING
307+SKIP_NAME_RESOLVE
308+SKIP_NETWORKING
309+SKIP_SHOW_DATABASE
310+SLAVE_COMPRESSED_PROTOCOL
311+SLAVE_EXEC_MODE
312+SLAVE_LOAD_TMPDIR
313+SLAVE_NET_TIMEOUT
314+SLAVE_SKIP_ERRORS
315+SLAVE_TRANSACTION_RETRIES
316+SLAVE_TYPE_CONVERSIONS
317+SLOW_LAUNCH_TIME
318+SLOW_QUERY_LOG
319+SLOW_QUERY_LOG_FILE
320+SLOW_QUERY_LOG_TIMESTAMP_ALWAYS
321+SLOW_QUERY_LOG_TIMESTAMP_PRECISION
322+SLOW_QUERY_LOG_USE_GLOBAL_CONTROL
323+SOCKET
324+SORT_BUFFER_SIZE
325+SQL_AUTO_IS_NULL
326+SQL_BIG_SELECTS
327+SQL_BIG_TABLES
328+SQL_BUFFER_RESULT
329+SQL_LOG_BIN
330+SQL_LOG_OFF
331+SQL_LOW_PRIORITY_UPDATES
332+SQL_MAX_JOIN_SIZE
333+SQL_MODE
334+SQL_NOTES
335+SQL_QUOTE_SHOW_CREATE
336+SQL_SAFE_UPDATES
337+SQL_SELECT_LIMIT
338+SQL_SLAVE_SKIP_COUNTER
339+SQL_WARNINGS
340+SSL_CA
341+SSL_CAPATH
342+SSL_CERT
343+SSL_CIPHER
344+SSL_KEY
345+STORAGE_ENGINE
346+SYNC_BINLOG
347+SYNC_FRM
348+SYNC_MASTER_INFO
349+SYNC_RELAY_LOG
350+SYNC_RELAY_LOG_INFO
351+SYSTEM_TIME_ZONE
352+TABLE_DEFINITION_CACHE
353+TABLE_OPEN_CACHE
354+THREAD_CACHE_SIZE
355+THREAD_CONCURRENCY
356+THREAD_HANDLING
357+THREAD_STACK
358+THREAD_STATISTICS
359+TIMED_MUTEXES
360+TIMESTAMP
361+TIME_FORMAT
362+TIME_ZONE
363+TMPDIR
364+TMP_TABLE_SIZE
365+TRANSACTION_ALLOC_BLOCK_SIZE
366+TRANSACTION_PREALLOC_SIZE
367+TX_ISOLATION
368+UNIQUE_CHECKS
369+UPDATABLE_VIEWS_WITH_LIMIT
370+USERSTAT
371+VERSION
372+VERSION_COMMENT
373+VERSION_COMPILE_MACHINE
374+VERSION_COMPILE_OS
375+WAIT_TIMEOUT
376+WARNING_COUNT
377
378=== added file 'mysql-test/percona_server_variables_release.result.OTHER'
379--- mysql-test/percona_server_variables_release.result.OTHER 1970-01-01 00:00:00 +0000
380+++ mysql-test/percona_server_variables_release.result.OTHER 2012-01-02 07:35:43 +0000
381@@ -0,0 +1,368 @@
382+SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
383+Variable_name
384+AUTOCOMMIT
385+AUTOMATIC_SP_PRIVILEGES
386+AUTO_INCREMENT_INCREMENT
387+AUTO_INCREMENT_OFFSET
388+BACK_LOG
389+BASEDIR
390+BIG_TABLES
391+BINLOG_CACHE_SIZE
392+BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES
393+BINLOG_FORMAT
394+BINLOG_STMT_CACHE_SIZE
395+BULK_INSERT_BUFFER_SIZE
396+CHARACTER_SETS_DIR
397+CHARACTER_SET_CLIENT
398+CHARACTER_SET_CONNECTION
399+CHARACTER_SET_DATABASE
400+CHARACTER_SET_FILESYSTEM
401+CHARACTER_SET_RESULTS
402+CHARACTER_SET_SERVER
403+CHARACTER_SET_SYSTEM
404+COLLATION_CONNECTION
405+COLLATION_DATABASE
406+COLLATION_SERVER
407+COMPLETION_TYPE
408+CONCURRENT_INSERT
409+CONNECT_TIMEOUT
410+DATADIR
411+DATETIME_FORMAT
412+DATE_FORMAT
413+DEFAULT_STORAGE_ENGINE
414+DEFAULT_WEEK_FORMAT
415+DELAYED_INSERT_LIMIT
416+DELAYED_INSERT_TIMEOUT
417+DELAYED_QUEUE_SIZE
418+DELAY_KEY_WRITE
419+DIV_PRECISION_INCREMENT
420+ENGINE_CONDITION_PUSHDOWN
421+ERROR_COUNT
422+EVENT_SCHEDULER
423+EXPIRE_LOGS_DAYS
424+EXTERNAL_USER
425+FAST_INDEX_CREATION
426+FLUSH
427+FLUSH_TIME
428+FOREIGN_KEY_CHECKS
429+FT_BOOLEAN_SYNTAX
430+FT_MAX_WORD_LEN
431+FT_MIN_WORD_LEN
432+FT_QUERY_EXPANSION_LIMIT
433+FT_STOPWORD_FILE
434+GENERAL_LOG
435+GENERAL_LOG_FILE
436+GROUP_CONCAT_MAX_LEN
437+HAVE_COMPRESS
438+HAVE_CRYPT
439+HAVE_CSV
440+HAVE_DYNAMIC_LOADING
441+HAVE_GEOMETRY
442+HAVE_INNODB
443+HAVE_NDBCLUSTER
444+HAVE_OPENSSL
445+HAVE_PARTITIONING
446+HAVE_PROFILING
447+HAVE_QUERY_CACHE
448+HAVE_RESPONSE_TIME_DISTRIBUTION
449+HAVE_RTREE_KEYS
450+HAVE_SSL
451+HAVE_SYMLINK
452+HOSTNAME
453+IDENTITY
454+IGNORE_BUILTIN_INNODB
455+INIT_CONNECT
456+INIT_FILE
457+INIT_SLAVE
458+INNODB_ADAPTIVE_FLUSHING
459+INNODB_ADAPTIVE_FLUSHING_METHOD
460+INNODB_ADAPTIVE_HASH_INDEX
461+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
462+INNODB_ADDITIONAL_MEM_POOL_SIZE
463+INNODB_AUTOEXTEND_INCREMENT
464+INNODB_AUTOINC_LOCK_MODE
465+INNODB_BUFFER_POOL_INSTANCES
466+INNODB_BUFFER_POOL_RESTORE_AT_STARTUP
467+INNODB_BUFFER_POOL_SHM_CHECKSUM
468+INNODB_BUFFER_POOL_SHM_KEY
469+INNODB_BUFFER_POOL_SIZE
470+INNODB_CHANGE_BUFFERING
471+INNODB_CHECKPOINT_AGE_TARGET
472+INNODB_CHECKSUMS
473+INNODB_COMMIT_CONCURRENCY
474+INNODB_CONCURRENCY_TICKETS
475+INNODB_CORRUPT_TABLE_ACTION
476+INNODB_DATA_FILE_PATH
477+INNODB_DATA_HOME_DIR
478+INNODB_DICT_SIZE_LIMIT
479+INNODB_DOUBLEWRITE
480+INNODB_DOUBLEWRITE_FILE
481+INNODB_FAST_CHECKSUM
482+INNODB_FAST_SHUTDOWN
483+INNODB_FILE_FORMAT
484+INNODB_FILE_FORMAT_CHECK
485+INNODB_FILE_FORMAT_MAX
486+INNODB_FILE_PER_TABLE
487+INNODB_FLUSH_LOG_AT_TRX_COMMIT
488+INNODB_FLUSH_METHOD
489+INNODB_FLUSH_NEIGHBOR_PAGES
490+INNODB_FORCE_RECOVERY
491+INNODB_IBUF_ACCEL_RATE
492+INNODB_IBUF_ACTIVE_CONTRACT
493+INNODB_IBUF_MAX_SIZE
494+INNODB_IMPORT_TABLE_FROM_XTRABACKUP
495+INNODB_IO_CAPACITY
496+INNODB_LARGE_PREFIX
497+INNODB_LAZY_DROP_TABLE
498+INNODB_LOCKS_UNSAFE_FOR_BINLOG
499+INNODB_LOCK_WAIT_TIMEOUT
500+INNODB_LOG_BLOCK_SIZE
501+INNODB_LOG_BUFFER_SIZE
502+INNODB_LOG_FILES_IN_GROUP
503+INNODB_LOG_FILE_SIZE
504+INNODB_LOG_GROUP_HOME_DIR
505+INNODB_MAX_DIRTY_PAGES_PCT
506+INNODB_MAX_PURGE_LAG
507+INNODB_MIRRORED_LOG_GROUPS
508+INNODB_OLD_BLOCKS_PCT
509+INNODB_OLD_BLOCKS_TIME
510+INNODB_OPEN_FILES
511+INNODB_PAGE_SIZE
512+INNODB_PURGE_BATCH_SIZE
513+INNODB_PURGE_THREADS
514+INNODB_READ_AHEAD
515+INNODB_READ_AHEAD_THRESHOLD
516+INNODB_READ_IO_THREADS
517+INNODB_RECOVERY_STATS
518+INNODB_RECOVERY_UPDATE_RELAY_LOG
519+INNODB_REPLICATION_DELAY
520+INNODB_ROLLBACK_ON_TIMEOUT
521+INNODB_ROLLBACK_SEGMENTS
522+INNODB_SHOW_LOCKS_HELD
523+INNODB_SHOW_VERBOSE_LOCKS
524+INNODB_SPIN_WAIT_DELAY
525+INNODB_STATS_AUTO_UPDATE
526+INNODB_STATS_METHOD
527+INNODB_STATS_ON_METADATA
528+INNODB_STATS_SAMPLE_PAGES
529+INNODB_STATS_UPDATE_NEED_LOCK
530+INNODB_STRICT_MODE
531+INNODB_SUPPORT_XA
532+INNODB_SYNC_SPIN_LOOPS
533+INNODB_TABLE_LOCKS
534+INNODB_THREAD_CONCURRENCY
535+INNODB_THREAD_CONCURRENCY_TIMER_BASED
536+INNODB_THREAD_SLEEP_DELAY
537+INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
538+INNODB_USE_NATIVE_AIO
539+INNODB_USE_SYS_MALLOC
540+INNODB_USE_SYS_STATS_TABLE
541+INNODB_VERSION
542+INNODB_WRITE_IO_THREADS
543+INSERT_ID
544+INTERACTIVE_TIMEOUT
545+JOIN_BUFFER_SIZE
546+KEEP_FILES_ON_CREATE
547+KEY_BUFFER_SIZE
548+KEY_CACHE_AGE_THRESHOLD
549+KEY_CACHE_BLOCK_SIZE
550+KEY_CACHE_DIVISION_LIMIT
551+LARGE_FILES_SUPPORT
552+LARGE_PAGES
553+LARGE_PAGE_SIZE
554+LAST_INSERT_ID
555+LC_MESSAGES
556+LC_MESSAGES_DIR
557+LC_TIME_NAMES
558+LICENSE
559+LOCAL_INFILE
560+LOCKED_IN_MEMORY
561+LOCK_WAIT_TIMEOUT
562+LOG
563+LOG_BIN
564+LOG_BIN_TRUST_FUNCTION_CREATORS
565+LOG_ERROR
566+LOG_OUTPUT
567+LOG_QUERIES_NOT_USING_INDEXES
568+LOG_SLAVE_UPDATES
569+LOG_SLOW_FILTER
570+LOG_SLOW_QUERIES
571+LOG_SLOW_SLAVE_STATEMENTS
572+LOG_SLOW_SP_STATEMENTS
573+LOG_SLOW_VERBOSITY
574+LOG_WARNINGS
575+LOG_WARNINGS_SUPPRESS
576+LONG_QUERY_TIME
577+LOWER_CASE_FILE_SYSTEM
578+LOWER_CASE_TABLE_NAMES
579+LOW_PRIORITY_UPDATES
580+MAX_ALLOWED_PACKET
581+MAX_BINLOG_CACHE_SIZE
582+MAX_BINLOG_SIZE
583+MAX_BINLOG_STMT_CACHE_SIZE
584+MAX_CONNECTIONS
585+MAX_CONNECT_ERRORS
586+MAX_DELAYED_THREADS
587+MAX_ERROR_COUNT
588+MAX_HEAP_TABLE_SIZE
589+MAX_INSERT_DELAYED_THREADS
590+MAX_JOIN_SIZE
591+MAX_LENGTH_FOR_SORT_DATA
592+MAX_LONG_DATA_SIZE
593+MAX_PREPARED_STMT_COUNT
594+MAX_RELAY_LOG_SIZE
595+MAX_SEEKS_FOR_KEY
596+MAX_SORT_LENGTH
597+MAX_SP_RECURSION_DEPTH
598+MAX_TMP_TABLES
599+MAX_USER_CONNECTIONS
600+MAX_WRITE_LOCK_COUNT
601+MIN_EXAMINED_ROW_LIMIT
602+MULTI_RANGE_COUNT
603+MYISAM_DATA_POINTER_SIZE
604+MYISAM_MAX_SORT_FILE_SIZE
605+MYISAM_MMAP_SIZE
606+MYISAM_RECOVER_OPTIONS
607+MYISAM_REPAIR_THREADS
608+MYISAM_SORT_BUFFER_SIZE
609+MYISAM_STATS_METHOD
610+MYISAM_USE_MMAP
611+NET_BUFFER_LENGTH
612+NET_READ_TIMEOUT
613+NET_RETRY_COUNT
614+NET_WRITE_TIMEOUT
615+NEW
616+OLD
617+OLD_ALTER_TABLE
618+OLD_PASSWORDS
619+OPEN_FILES_LIMIT
620+OPTIMIZER_FIX
621+OPTIMIZER_PRUNE_LEVEL
622+OPTIMIZER_SEARCH_DEPTH
623+OPTIMIZER_SWITCH
624+PERFORMANCE_SCHEMA
625+PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE
626+PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE
627+PERFORMANCE_SCHEMA_MAX_COND_CLASSES
628+PERFORMANCE_SCHEMA_MAX_COND_INSTANCES
629+PERFORMANCE_SCHEMA_MAX_FILE_CLASSES
630+PERFORMANCE_SCHEMA_MAX_FILE_HANDLES
631+PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES
632+PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES
633+PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES
634+PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES
635+PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES
636+PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES
637+PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES
638+PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES
639+PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES
640+PID_FILE
641+PLUGIN_DIR
642+PORT
643+PRELOAD_BUFFER_SIZE
644+PROFILING
645+PROFILING_HISTORY_SIZE
646+PROTOCOL_VERSION
647+PROXY_USER
648+PSEUDO_THREAD_ID
649+QUERY_ALLOC_BLOCK_SIZE
650+QUERY_CACHE_LIMIT
651+QUERY_CACHE_MIN_RES_UNIT
652+QUERY_CACHE_SIZE
653+QUERY_CACHE_STRIP_COMMENTS
654+QUERY_CACHE_TYPE
655+QUERY_CACHE_WLOCK_INVALIDATE
656+QUERY_PREALLOC_SIZE
657+QUERY_RESPONSE_TIME_RANGE_BASE
658+QUERY_RESPONSE_TIME_STATS
659+RAND_SEED1
660+RAND_SEED2
661+RANGE_ALLOC_BLOCK_SIZE
662+READ_BUFFER_SIZE
663+READ_ONLY
664+READ_RND_BUFFER_SIZE
665+RELAY_LOG
666+RELAY_LOG_INDEX
667+RELAY_LOG_INFO_FILE
668+RELAY_LOG_PURGE
669+RELAY_LOG_RECOVERY
670+RELAY_LOG_SPACE_LIMIT
671+REPORT_HOST
672+REPORT_PASSWORD
673+REPORT_PORT
674+REPORT_USER
675+RPL_RECOVERY_RANK
676+SECURE_AUTH
677+SECURE_FILE_PRIV
678+SERVER_ID
679+SKIP_EXTERNAL_LOCKING
680+SKIP_NAME_RESOLVE
681+SKIP_NETWORKING
682+SKIP_SHOW_DATABASE
683+SLAVE_COMPRESSED_PROTOCOL
684+SLAVE_EXEC_MODE
685+SLAVE_LOAD_TMPDIR
686+SLAVE_NET_TIMEOUT
687+SLAVE_SKIP_ERRORS
688+SLAVE_TRANSACTION_RETRIES
689+SLAVE_TYPE_CONVERSIONS
690+SLOW_LAUNCH_TIME
691+SLOW_QUERY_LOG
692+SLOW_QUERY_LOG_FILE
693+SLOW_QUERY_LOG_TIMESTAMP_ALWAYS
694+SLOW_QUERY_LOG_TIMESTAMP_PRECISION
695+SLOW_QUERY_LOG_USE_GLOBAL_CONTROL
696+SOCKET
697+SORT_BUFFER_SIZE
698+SQL_AUTO_IS_NULL
699+SQL_BIG_SELECTS
700+SQL_BIG_TABLES
701+SQL_BUFFER_RESULT
702+SQL_LOG_BIN
703+SQL_LOG_OFF
704+SQL_LOW_PRIORITY_UPDATES
705+SQL_MAX_JOIN_SIZE
706+SQL_MODE
707+SQL_NOTES
708+SQL_QUOTE_SHOW_CREATE
709+SQL_SAFE_UPDATES
710+SQL_SELECT_LIMIT
711+SQL_SLAVE_SKIP_COUNTER
712+SQL_WARNINGS
713+SSL_CA
714+SSL_CAPATH
715+SSL_CERT
716+SSL_CIPHER
717+SSL_KEY
718+STORAGE_ENGINE
719+SYNC_BINLOG
720+SYNC_FRM
721+SYNC_MASTER_INFO
722+SYNC_RELAY_LOG
723+SYNC_RELAY_LOG_INFO
724+SYSTEM_TIME_ZONE
725+TABLE_DEFINITION_CACHE
726+TABLE_OPEN_CACHE
727+THREAD_CACHE_SIZE
728+THREAD_CONCURRENCY
729+THREAD_HANDLING
730+THREAD_STACK
731+THREAD_STATISTICS
732+TIMED_MUTEXES
733+TIMESTAMP
734+TIME_FORMAT
735+TIME_ZONE
736+TMPDIR
737+TMP_TABLE_SIZE
738+TRANSACTION_ALLOC_BLOCK_SIZE
739+TRANSACTION_PREALLOC_SIZE
740+TX_ISOLATION
741+UNIQUE_CHECKS
742+UPDATABLE_VIEWS_WITH_LIMIT
743+USERSTAT
744+VERSION
745+VERSION_COMMENT
746+VERSION_COMPILE_MACHINE
747+VERSION_COMPILE_OS
748+WAIT_TIMEOUT
749+WARNING_COUNT
750
751=== modified file 'patches/slow_extended.patch'
752--- patches/slow_extended.patch 2011-12-13 15:06:50 +0000
753+++ patches/slow_extended.patch 2012-01-02 07:35:43 +0000
754@@ -1474,6 +1474,7 @@
755 };
756
757 # endif /* HAVE_PROFILING */
758+<<<<<<< TREE
759 --- /dev/null
760 +++ b/mysql-test/include/log_grep.inc
761 @@ -0,0 +1,17 @@
762@@ -2770,3 +2771,116 @@
763 sort-buffer-size 2097152
764 sporadic-binlog-dump-fail FALSE
765 sql-mode
766+=======
767+--- /dev/null
768++++ b/mysql-test/include/percona_log_slow_rate_limit_show.inc
769+@@ -0,0 +1,4 @@
770++SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
771++SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
772++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
773++SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
774+--- /dev/null
775++++ b/mysql-test/r/percona_log_slow_rate_limit.result
776+@@ -0,0 +1,43 @@
777++SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
778++Variable_name Value
779++log_slow_rate_limit 1
780++SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
781++Variable_name Value
782++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
783++VARIABLE_NAME VARIABLE_VALUE
784++LOG_SLOW_RATE_LIMIT 1
785++SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
786++VARIABLE_NAME VARIABLE_VALUE
787++SET GLOBAL log_slow_rate_limit=2;
788++SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
789++Variable_name Value
790++log_slow_rate_limit 2
791++SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
792++Variable_name Value
793++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
794++VARIABLE_NAME VARIABLE_VALUE
795++LOG_SLOW_RATE_LIMIT 2
796++SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
797++VARIABLE_NAME VARIABLE_VALUE
798++SET GLOBAL log_slow_rate_limit=100;
799++SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
800++Variable_name Value
801++log_slow_rate_limit 100
802++SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
803++Variable_name Value
804++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
805++VARIABLE_NAME VARIABLE_VALUE
806++LOG_SLOW_RATE_LIMIT 100
807++SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
808++VARIABLE_NAME VARIABLE_VALUE
809++SET GLOBAL log_slow_rate_limit=default;
810++SHOW GLOBAL VARIABLES LIKE 'log_slow_rate_limit';
811++Variable_name Value
812++log_slow_rate_limit 1
813++SHOW SESSION VARIABLES LIKE 'log_slow_rate_limit';
814++Variable_name Value
815++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
816++VARIABLE_NAME VARIABLE_VALUE
817++LOG_SLOW_RATE_LIMIT 1
818++SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='log_slow_rate_limit';
819++VARIABLE_NAME VARIABLE_VALUE
820+--- /dev/null
821++++ b/mysql-test/t/percona_log_slow_rate_limit.test
822+@@ -0,0 +1,7 @@
823++--source include/percona_log_slow_rate_limit_show.inc
824++SET GLOBAL log_slow_rate_limit=2;
825++--source include/percona_log_slow_rate_limit_show.inc
826++SET GLOBAL log_slow_rate_limit=100;
827++--source include/percona_log_slow_rate_limit_show.inc
828++SET GLOBAL log_slow_rate_limit=default;
829++--source include/percona_log_slow_rate_limit_show.inc
830+--- /dev/null
831++++ b/mysql-test/r/percona_log_slow_rate_limit_check.result
832+@@ -0,0 +1,16 @@
833++DROP TABLE IF EXISTS t1;
834++CREATE TABLE t1 (a INT);
835++INSERT INTO t1 VALUES (123);
836++SET GLOBAL slow_query_log_use_global_control='long_query_time';
837++SET GLOBAL long_query_time=0;
838++SET GLOBAL log_slow_rate_limit=2;
839++[log_start.inc] percona_log_slow_rate_limit_check_slowlog
840++SELECT COUNT(*) FROM t1;
841++COUNT(*)
842++1
843++SELECT COUNT(*) FROM t1;
844++COUNT(*)
845++1
846++[log_stop.inc] percona_log_slow_rate_limit_check_slowlog
847++[log_grep.inc] file: percona_log_slow_rate_limit_check_slowlog pattern: SELECT COUNT
848++[log_grep.inc] lines: 1
849+--- /dev/null
850++++ b/mysql-test/t/percona_log_slow_rate_limit_check.test
851+@@ -0,0 +1,26 @@
852++--let log_file=percona_log_slow_rate_limit_check_slowlog
853++--disable_warnings
854++DROP TABLE IF EXISTS t1;
855++--enable_warnings
856++
857++CREATE TABLE t1 (a INT);
858++INSERT INTO t1 VALUES (123);
859++SET GLOBAL slow_query_log_use_global_control='long_query_time';
860++SET GLOBAL long_query_time=0;
861++SET GLOBAL log_slow_rate_limit=2;
862++--source include/log_start.inc
863++connect (conn1,localhost,root,,);
864++connect (conn2,localhost,root,,);
865++connection conn1;
866++SELECT COUNT(*) FROM t1;
867++connection conn2;
868++SELECT COUNT(*) FROM t1;
869++connection default;
870++--source include/log_stop.inc
871++
872++--let grep_pattern = SELECT COUNT
873++--source include/log_grep.inc
874++DROP TABLE t1;
875++SET GLOBAL slow_query_log_use_global_control=default;
876++SET GLOBAL long_query_time=default;
877++SET GLOBAL log_slow_rate_limit=default;
878+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches