]> git.pld-linux.org Git - packages/mysql.git/blame - mysql-test.diff
projects / packages / mysql.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
avoid printf format vulnreability from slave status output
[packages/mysql.git] / mysql-test.diff
CommitLineData
b4e1fa2c
AM		 1# name : mysql-test.diff
2# introduced : ???
3# maintainer : ???
4#
5#!!! notice !!!
6# Any small change to this file in the main branch
7# should be done or reviewed by the maintainer!
8diff -ruN a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
9--- a/mysql-test/include/default_mysqld.cnf 2010-11-03 07:01:11.000000000 +0900
10+++ b/mysql-test/include/default_mysqld.cnf 2010-12-10 16:48:10.996387047 +0900
11@@ -29,7 +29,7 @@
12 max_heap_table_size= 1M
13
14 loose-innodb_data_file_path= ibdata1:10M:autoextend
15-loose-innodb_buffer_pool_size= 8M
16+loose-innodb_buffer_pool_size= 32M
17 loose-innodb_write_io_threads= 2
18 loose-innodb_read_io_threads= 2
19 loose-innodb_log_buffer_size= 1M
20diff -ruN a/mysql-test/r/connect.result b/mysql-test/r/connect.result
21--- a/mysql-test/r/connect.result 2010-11-03 07:01:12.000000000 +0900
22+++ b/mysql-test/r/connect.result 2010-12-10 16:48:10.997386982 +0900
23@@ -1,3 +1,4 @@
24+set global log_warnings=0;
25 drop table if exists t1,t2;
26 show tables;
27 Tables_in_mysql
28@@ -221,3 +222,4 @@
29 # ------------------------------------------------------------------
30 # -- End of 5.1 tests
31 # ------------------------------------------------------------------
32+set global log_warnings=1;
33diff -ruN a/mysql-test/r/create.result b/mysql-test/r/create.result
34--- a/mysql-test/r/create.result 2010-11-03 07:01:12.000000000 +0900
35+++ b/mysql-test/r/create.result 2010-12-10 16:48:11.001009442 +0900
36@@ -1741,7 +1741,8 @@
37 `COMMAND` varchar(16) NOT NULL DEFAULT '',
38 `TIME` int(7) NOT NULL DEFAULT '0',
39 `STATE` varchar(64) DEFAULT NULL,
40- `INFO` longtext
41+ `INFO` longtext,
42+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0'
43 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
44 drop table t1;
45 create temporary table t1 like information_schema.processlist;
46@@ -1755,7 +1756,8 @@
47 `COMMAND` varchar(16) NOT NULL DEFAULT '',
48 `TIME` int(7) NOT NULL DEFAULT '0',
49 `STATE` varchar(64) DEFAULT NULL,
50- `INFO` longtext
51+ `INFO` longtext,
52+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0'
53 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
54 drop table t1;
55 create table t1 like information_schema.character_sets;
56diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
57--- a/mysql-test/r/information_schema.result 2010-12-03 20:58:24.000000000 +0300
58+++ b/mysql-test/r/information_schema.result 2011-01-10 23:02:09.000000000 +0300
59@@ -46,14 +46,17 @@
60 select * from v1;
61 c
62 CHARACTER_SETS
63+CLIENT_STATISTICS
64 COLLATIONS
65 COLLATION_CHARACTER_SET_APPLICABILITY
66 COLUMNS
67 COLUMN_PRIVILEGES
68+INDEX_STATISTICS
69 ENGINES
70 EVENTS
71 FILES
72 GLOBAL_STATUS
73+GLOBAL_TEMPORARY_TABLES
74 GLOBAL_VARIABLES
75 KEY_COLUMN_USAGE
76 PARAMETERS
77@@ -63,6 +66,7 @@
78 PROFILING
79 REFERENTIAL_CONSTRAINTS
80 ROUTINES
81+QUERY_RESPONSE_TIME
82 SCHEMATA
83 SCHEMA_PRIVILEGES
84 SESSION_STATUS
85@@ -72,9 +76,14 @@
86 TABLESPACES
87 TABLE_CONSTRAINTS
88 TABLE_PRIVILEGES
89+TABLE_STATISTICS
90+TEMPORARY_TABLES
91+THREAD_STATISTICS
92 TRIGGERS
93 USER_PRIVILEGES
94+USER_STATISTICS
95 VIEWS
96+XTRADB_ADMIN_COMMAND
97 columns_priv
98 db
99 event
100@@ -112,6 +121,9 @@
101 TABLESPACES TABLESPACES
102 TABLE_CONSTRAINTS TABLE_CONSTRAINTS
103 TABLE_PRIVILEGES TABLE_PRIVILEGES
104+TABLE_STATISTICS TABLE_STATISTICS
105+TEMPORARY_TABLES TEMPORARY_TABLES
106+THREAD_STATISTICS THREAD_STATISTICS
107 TRIGGERS TRIGGERS
108 tables_priv tables_priv
109 time_zone time_zone
110@@ -132,6 +144,9 @@
111 TABLESPACES TABLESPACES
112 TABLE_CONSTRAINTS TABLE_CONSTRAINTS
113 TABLE_PRIVILEGES TABLE_PRIVILEGES
114+TABLE_STATISTICS TABLE_STATISTICS
115+TEMPORARY_TABLES TEMPORARY_TABLES
116+THREAD_STATISTICS THREAD_STATISTICS
117 TRIGGERS TRIGGERS
118 tables_priv tables_priv
119 time_zone time_zone
120@@ -152,6 +167,9 @@
121 TABLESPACES TABLESPACES
122 TABLE_CONSTRAINTS TABLE_CONSTRAINTS
123 TABLE_PRIVILEGES TABLE_PRIVILEGES
124+TABLE_STATISTICS TABLE_STATISTICS
125+TEMPORARY_TABLES TEMPORARY_TABLES
126+THREAD_STATISTICS THREAD_STATISTICS
127 TRIGGERS TRIGGERS
128 tables_priv tables_priv
129 time_zone time_zone
130@@ -634,13 +652,16 @@
131 where table_schema='information_schema' limit 2;
132 TABLE_NAME TABLE_TYPE ENGINE
133 CHARACTER_SETS SYSTEM VIEW MEMORY
134-COLLATIONS SYSTEM VIEW MEMORY
135+CLIENT_STATISTICS SYSTEM VIEW MEMORY
136 show tables from information_schema like "T%";
137 Tables_in_information_schema (T%)
138 TABLES
139 TABLESPACES
140 TABLE_CONSTRAINTS
141 TABLE_PRIVILEGES
142+TABLE_STATISTICS
143+TEMPORARY_TABLES
144+THREAD_STATISTICS
145 TRIGGERS
146 create database information_schema;
147 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
148@@ -651,6 +672,9 @@
149 TABLESPACES SYSTEM VIEW
150 TABLE_CONSTRAINTS SYSTEM VIEW
151 TABLE_PRIVILEGES SYSTEM VIEW
152+TABLE_STATISTICS SYSTEM VIEW
153+TEMPORARY_TABLES SYSTEM VIEW
154+THREAD_STATISTICS SYSTEM VIEW
155 TRIGGERS SYSTEM VIEW
156 create table t1(a int);
157 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
158@@ -664,6 +688,9 @@
159 TABLESPACES
160 TABLE_CONSTRAINTS
161 TABLE_PRIVILEGES
162+TABLE_STATISTICS
163+TEMPORARY_TABLES
164+THREAD_STATISTICS
165 TRIGGERS
166 select table_name from tables where table_name='user';
167 table_name
168@@ -806,6 +833,8 @@
169 FILES CREATE_TIME datetime
170 FILES UPDATE_TIME datetime
171 FILES CHECK_TIME datetime
172+GLOBAL_TEMPORARY_TABLES CREATE_TIME datetime
173+GLOBAL_TEMPORARY_TABLES UPDATE_TIME datetime
174 PARTITIONS CREATE_TIME datetime
175 PARTITIONS UPDATE_TIME datetime
176 PARTITIONS CHECK_TIME datetime
177@@ -814,6 +843,8 @@
178 TABLES CREATE_TIME datetime
179 TABLES UPDATE_TIME datetime
180 TABLES CHECK_TIME datetime
181+TEMPORARY_TABLES CREATE_TIME datetime
182+TEMPORARY_TABLES UPDATE_TIME datetime
183 TRIGGERS CREATED datetime
184 event execute_at datetime
185 event last_executed datetime
186@@ -854,7 +885,9 @@
187 TABLE_NAME COLUMN_NAME PRIVILEGES
188 COLUMNS TABLE_NAME select
189 COLUMN_PRIVILEGES TABLE_NAME select
190+INDEX_STATISTICS TABLE_NAME select
191 FILES TABLE_NAME select
192+GLOBAL_TEMPORARY_TABLES TABLE_NAME select
193 KEY_COLUMN_USAGE TABLE_NAME select
194 PARTITIONS TABLE_NAME select
195 REFERENTIAL_CONSTRAINTS TABLE_NAME select
196@@ -862,7 +895,11 @@
197 TABLES TABLE_NAME select
198 TABLE_CONSTRAINTS TABLE_NAME select
199 TABLE_PRIVILEGES TABLE_NAME select
200+TABLE_STATISTICS TABLE_NAME select
201+TEMPORARY_TABLES TABLE_NAME select
202 VIEWS TABLE_NAME select
203+INNODB_TABLE_STATS table_name select
204+INNODB_INDEX_STATS table_name select
205 delete from mysql.user where user='mysqltest_4';
206 delete from mysql.db where user='mysqltest_4';
207 flush privileges;
208@@ -871,7 +908,7 @@
209 AND table_name not like 'ndb%' AND table_name not like 'innodb_%'
210 GROUP BY TABLE_SCHEMA;
211 table_schema count(*)
212-information_schema 30
213+information_schema 39
214 mysql 23
215 create table t1 (i int, j int);
216 create trigger trg1 before insert on t1 for each row
217@@ -1245,12 +1282,12 @@
218 DROP USER mysql_bug20230@localhost;
219 SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
220 MAX(table_name)
221-VIEWS
222+XTRADB_ADMIN_COMMAND
223 SELECT table_name from information_schema.tables
224 WHERE table_name=(SELECT MAX(table_name)
225 FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'));
226 table_name
227-VIEWS
228+XTRADB_ADMIN_COMMAND
229 DROP TABLE IF EXISTS bug23037;
230 DROP FUNCTION IF EXISTS get_value;
231 SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
232@@ -1311,6 +1348,7 @@
233 group by t.table_name order by num1, t.table_name;
234 table_name group_concat(t.table_schema, '.', t.table_name) num1
235 CHARACTER_SETS information_schema.CHARACTER_SETS 1
236+CLIENT_STATISTICS information_schema.CLIENT_STATISTICS 1
237 COLLATIONS information_schema.COLLATIONS 1
238 COLLATION_CHARACTER_SET_APPLICABILITY information_schema.COLLATION_CHARACTER_SET_APPLICABILITY 1
239 COLUMNS information_schema.COLUMNS 1
240@@ -1319,13 +1357,16 @@
241 EVENTS information_schema.EVENTS 1
242 FILES information_schema.FILES 1
243 GLOBAL_STATUS information_schema.GLOBAL_STATUS 1
244+GLOBAL_TEMPORARY_TABLES information_schema.GLOBAL_TEMPORARY_TABLES 1
245 GLOBAL_VARIABLES information_schema.GLOBAL_VARIABLES 1
246+INDEX_STATISTICS information_schema.INDEX_STATISTICS 1
247 KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
248 PARAMETERS information_schema.PARAMETERS 1
249 PARTITIONS information_schema.PARTITIONS 1
250 PLUGINS information_schema.PLUGINS 1
251 PROCESSLIST information_schema.PROCESSLIST 1
252 PROFILING information_schema.PROFILING 1
253+QUERY_RESPONSE_TIME information_schema.QUERY_RESPONSE_TIME 1
254 REFERENTIAL_CONSTRAINTS information_schema.REFERENTIAL_CONSTRAINTS 1
255 ROUTINES information_schema.ROUTINES 1
256 SCHEMATA information_schema.SCHEMATA 1
257@@ -1337,8 +1378,12 @@
258 TABLESPACES information_schema.TABLESPACES 1
259 TABLE_CONSTRAINTS information_schema.TABLE_CONSTRAINTS 1
260 TABLE_PRIVILEGES information_schema.TABLE_PRIVILEGES 1
261+TABLE_STATISTICS information_schema.TABLE_STATISTICS 1
262+TEMPORARY_TABLES information_schema.TEMPORARY_TABLES 1
263+THREAD_STATISTICS information_schema.THREAD_STATISTICS 1
264 TRIGGERS information_schema.TRIGGERS 1
265 USER_PRIVILEGES information_schema.USER_PRIVILEGES 1
266+USER_STATISTICS information_schema.USER_STATISTICS 1
267 VIEWS information_schema.VIEWS 1
268 create table t1(f1 int);
269 create view v1 as select f1+1 as a from t1;
270diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
271--- a/mysql-test/r/information_schema_db.result 2010-12-03 20:58:24.000000000 +0300
272+++ b/mysql-test/r/information_schema_db.result 2011-01-10 23:06:43.000000000 +0300
273@@ -6,14 +6,17 @@
274 show tables where Tables_in_information_schema NOT LIKE 'Innodb%';
275 Tables_in_information_schema
276 CHARACTER_SETS
277+CLIENT_STATISTICS
278 COLLATIONS
279 COLLATION_CHARACTER_SET_APPLICABILITY
280 COLUMNS
281 COLUMN_PRIVILEGES
282+INDEX_STATISTICS
283 ENGINES
284 EVENTS
285 FILES
286 GLOBAL_STATUS
287+GLOBAL_TEMPORARY_TABLES
288 GLOBAL_VARIABLES
289 KEY_COLUMN_USAGE
290 PARAMETERS
291@@ -23,6 +26,7 @@
292 PROFILING
293 REFERENTIAL_CONSTRAINTS
294 ROUTINES
295+QUERY_RESPONSE_TIME
296 SCHEMATA
297 SCHEMA_PRIVILEGES
298 SESSION_STATUS
299@@ -32,15 +36,23 @@
300 TABLESPACES
301 TABLE_CONSTRAINTS
302 TABLE_PRIVILEGES
303+TABLE_STATISTICS
304+TEMPORARY_TABLES
305+THREAD_STATISTICS
306 TRIGGERS
307 USER_PRIVILEGES
308+USER_STATISTICS
309 VIEWS
310+XTRADB_ADMIN_COMMAND
311 show tables from INFORMATION_SCHEMA like 'T%';
312 Tables_in_information_schema (T%)
313 TABLES
314 TABLESPACES
315 TABLE_CONSTRAINTS
316 TABLE_PRIVILEGES
317+TABLE_STATISTICS
318+TEMPORARY_TABLES
319+THREAD_STATISTICS
320 TRIGGERS
321 create database `inf%`;
322 create database mbase;
323diff -ruN a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
d8778560
AM		 324--- a/mysql-test/r/mysqld--help-notwin.result 2011-01-20 00:37:09.000000000 +0200
325+++ b/mysql-test/r/mysqld--help-notwin.result 2011-02-18 13:14:44.701736864 +0200
326@@ -249,21 +249,43 @@
b4e1fa2c
AM		 327 --log-slow-admin-statements
328 Log slow OPTIMIZE, ANALYZE, ALTER and other
329 administrative statements to the slow log if it is open.
330+ --log-slow-filter=name
331+ Log only the queries that followed certain execution
332+ plan. Multiple flags allowed in a comma-separated string.
333+ [qc_miss, full_scan, full_join, tmp_table,
334+ tmp_table_on_disk, filesort, filesort_on_disk]
335 --log-slow-queries[=name]
336 Log slow queries to a table or log file. Defaults logging
337 to table mysql.slow_log or hostname-slow.log if
338 --log-output=file is used. Must be enabled to activate
339 other slow log options. Deprecated option, use
340 --slow-query-log/--slow-query-log-file instead.
341+ --log-slow-rate-limit=#
342+ Rate limit statement writes to slow log to only those
343+ from every (1/log_slow_rate_limit) session.
344 --log-slow-slave-statements
345- Log slow statements executed by slave thread to the slow
346- log if it is open.
347+ Log queries replayed be the slave SQL thread
348+ --log-slow-sp-statements
349+ Log slow statements executed by stored procedure to the
350+ slow log if it is open.
351+ (Defaults to on; use --skip-log-slow-sp-statements to disable.)
352+ --log-slow-timestamp-every
353+ Timestamp is printed for all records of the slow log even
354+ if they are same time.
355+ --log-slow-verbosity=name
356+ Choose how verbose the messages to your slow log will be.
357+ Multiple flags allowed in a comma-separated string.
358+ [microtime, query_plan, innodb, profiling,
d8778560 359+ profiling_use_getrusage]
b4e1fa2c
AM		 360 --log-tc=name Path to transaction coordinator log (used for
361 transactions that affect more than one storage engine,
362 when binary log is disabled).
363 --log-tc-size=# Size of transaction coordinator log.
364 -W, --log-warnings[=#]
365 Log some not critical warnings to the log file
366+ --log-warnings-silence=name
367+ disable logging of enumerated warnings: 1592: unsafe
368+ statements for binary logging; possible values : [1592]
369 --long-query-time=# Log all queries that have taken more than long_query_time
370 seconds to execute to file. The argument will be treated
371 as a decimal value with microsecond precision
d8778560 372@@ -470,6 +492,10 @@
b4e1fa2c
AM		 373 The minimum size for blocks allocated by the query cache
374 --query-cache-size=#
375 The memory allocated to store results from old queries
376+ --query-cache-strip-comments
377+ Enable and disable optimisation "strip comment for query
378+ cache" - optimisation strip all comments from query while
379+ search query result in query cache
380 --query-cache-type=name
381 OFF = Don't cache or retrieve results. ON = Cache all
382 results except SELECT SQL_NO_CACHE ... queries. DEMAND =
d8778560 383@@ -478,6 +504,12 @@
b4e1fa2c
AM		 384 Invalidate queries in query cache on LOCK for write
385 --query-prealloc-size=#
386 Persistent buffer for query parsing and execution
387+ --query-response-time-range-base=#
388+ Select base of log for query_response_time ranges.
389+ WARNING: variable change affect only after flush
d8778560
AM		 390+ --query-response-time-stats
391+ Enable or disable query response time statisics
392+ collecting
b4e1fa2c
AM		 393 --range-alloc-block-size=#
394 Allocation block size for storing ranges during
395 optimization
d8778560 396@@ -655,6 +687,9 @@
b4e1fa2c
AM		 397 Log slow queries to given log file. Defaults logging to
398 hostname-slow.log. Must be enabled to activate other slow
399 log options
400+ --slow-query-log-microseconds-timestamp
401+ Log slow statements executed by stored procedure to the
402+ slow log if it is open.
403 --socket=name Socket file to use for connection
404 --sort-buffer-size=#
405 Each thread that needs to do a sort allocates a buffer of
d8778560 406@@ -697,6 +732,8 @@
b4e1fa2c
AM		 407 Define threads usage for handling queries, one of
408 one-thread-per-connection, no-threads, loaded-dynamically
409 --thread-stack=# The stack size for each thread
410+ --thread-statistics Control TABLE_STATISTICS running, when userstat_running
411+ is enabled
412 --time-format=name The TIME format (ignored)
413 --timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
414 currently supported)
d8778560 415@@ -721,11 +758,24 @@
b4e1fa2c
AM		 416 Prohibit update of a VIEW, which does not contain a key
417 of the underlying table and the query uses a LIMIT clause
418 (usually get from GUI tools)
419+ --use-global-log-slow-control=name
420+ Choose flags, wich always use the global variables.
421+ Multiple flags allowed in a comma-separated string.
422+ [none, log_slow_filter, log_slow_rate_limit,
423+ log_slow_verbosity, long_query_time,
424+ min_examined_row_limit, all]
425 -u, --user=name Run mysqld daemon as user.
426+ --userstat-running Control USER_STATISTICS, CLIENT_STATISTICS,
427+ THREAD_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS
428+ running
429 -v, --verbose Used with --help option for detailed help.
430 -V, --version Output version information and exit.
431 --wait-timeout=# The number of seconds the server waits for activity on a
432 connection before closing it
433+ --xtradb-admin-command[=name]
434+ Enable or disable XTRADB_ADMIN_COMMAND plugin. Possible
435+ values are ON, OFF, FORCE (don't start if the plugin
436+ fails to load).
437
438 Variables (--variable-name=value)
439 abort-slave-event-count 0
d8778560 440@@ -807,10 +857,16 @@
b4e1fa2c
AM		 441 log-short-format FALSE
442 log-slave-updates FALSE
443 log-slow-admin-statements FALSE
444+log-slow-filter
445+log-slow-rate-limit 1
446 log-slow-slave-statements FALSE
447+log-slow-sp-statements TRUE
448+log-slow-timestamp-every FALSE
449+log-slow-verbosity
450 log-tc tc.log
451 log-tc-size 24576
452 log-warnings 1
453+log-warnings-silence
454 long-query-time 10
455 low-priority-updates FALSE
456 lower-case-table-names 1
d8778560 457@@ -885,9 +941,12 @@
b4e1fa2c
AM		 458 query-cache-limit 1048576
459 query-cache-min-res-unit 4096
460 query-cache-size 0
461+query-cache-strip-comments FALSE
462 query-cache-type ON
463 query-cache-wlock-invalidate FALSE
464 query-prealloc-size 8192
465+query-response-time-range-base 10
d8778560 466+query-response-time-stats FALSE
b4e1fa2c
AM		 467 range-alloc-block-size 4096
468 read-buffer-size 131072
469 read-only FALSE
d8778560 470@@ -922,6 +981,7 @@
b4e1fa2c
AM		 471 slave-type-conversions
472 slow-launch-time 2
473 slow-query-log FALSE
474+slow-query-log-microseconds-timestamp FALSE
475 sort-buffer-size 2097152
476 sporadic-binlog-dump-fail FALSE
477 sql-mode
d8778560 478@@ -939,6 +999,7 @@
b4e1fa2c
AM		 479 thread-cache-size 0
480 thread-handling one-thread-per-connection
481 thread-stack 262144
482+thread-statistics FALSE
483 time-format %H:%i:%s
484 timed-mutexes FALSE
485 tmp-table-size 16777216
d8778560 486@@ -946,8 +1007,11 @@
b4e1fa2c
AM		 487 transaction-isolation REPEATABLE-READ
488 transaction-prealloc-size 4096
489 updatable-views-with-limit YES
490+use-global-log-slow-control
491+userstat-running FALSE
492 verbose TRUE
493 wait-timeout 28800
494+xtradb-admin-command ON
495
496 To see what values a running MySQL server is using, type
497 'mysqladmin variables' instead of 'mysqld --verbose --help'.
498diff -ruN a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
499--- a/mysql-test/r/mysqldump.result 2010-11-03 07:01:12.000000000 +0900
500+++ b/mysql-test/r/mysqldump.result 2010-12-10 16:48:11.013968901 +0900
501@@ -1832,7 +1832,7 @@
502 # Bug#21288 mysqldump segmentation fault when using --where
503 #
504 create table t1 (a int);
505-mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
506+mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ /*!50084 SQL_NO_FCACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
507 mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server
508
509 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
510diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
511--- a/mysql-test/r/mysqlshow.result 2010-12-03 20:58:24.000000000 +0300
512+++ b/mysql-test/r/mysqlshow.result 2011-01-11 16:41:03.000000000 +0300
513@@ -80,14 +80,17 @@
514 | Tables |
515 +---------------------------------------+
516 | CHARACTER_SETS |
517+| CLIENT_STATISTICS |
518 | COLLATIONS |
519 | COLLATION_CHARACTER_SET_APPLICABILITY |
520 | COLUMNS |
521 | COLUMN_PRIVILEGES |
522+| INDEX_STATISTICS |
523 | ENGINES |
524 | EVENTS |
525 | FILES |
526 | GLOBAL_STATUS |
527+| GLOBAL_TEMPORARY_TABLES |
528 | GLOBAL_VARIABLES |
529 | KEY_COLUMN_USAGE |
530 | PARAMETERS |
531@@ -97,6 +100,7 @@
532 | PROFILING |
533 | REFERENTIAL_CONSTRAINTS |
534 | ROUTINES |
535+| QUERY_RESPONSE_TIME |
536 | SCHEMATA |
537 | SCHEMA_PRIVILEGES |
538 | SESSION_STATUS |
539@@ -106,30 +110,52 @@
540 | TABLESPACES |
541 | TABLE_CONSTRAINTS |
542 | TABLE_PRIVILEGES |
543+| TABLE_STATISTICS |
544+| TEMPORARY_TABLES |
545+| THREAD_STATISTICS |
546 | TRIGGERS |
547 | USER_PRIVILEGES |
548+| USER_STATISTICS |
549 | VIEWS |
550-| INNODB_CMP_RESET |
551+| INNODB_SYS_COLUMNS |
552+| INNODB_RSEG |
553+| INNODB_CMP |
554 | INNODB_TRX |
555-| INNODB_CMPMEM_RESET |
556+| INNODB_SYS_TABLESTATS |
557 | INNODB_LOCK_WAITS |
558-| INNODB_CMPMEM |
559-| INNODB_CMP |
560+| XTRADB_ADMIN_COMMAND |
561 | INNODB_LOCKS |
562+| INNODB_SYS_FOREIGN_COLS |
563+| INNODB_CMP_RESET |
564+| INNODB_BUFFER_POOL_PAGES |
565+| INNODB_SYS_TABLES |
566+| INNODB_BUFFER_POOL_PAGES_INDEX |
567+| INNODB_CMPMEM |
568+| INNODB_BUFFER_POOL_PAGES_BLOB |
569+| INNODB_CMPMEM_RESET |
570+| INNODB_SYS_FIELDS |
571+| INNODB_TABLE_STATS |
572+| INNODB_SYS_STATS |
573+| INNODB_SYS_FOREIGN |
574+| INNODB_SYS_INDEXES |
575+| INNODB_INDEX_STATS |
576 +---------------------------------------+
577 Database: INFORMATION_SCHEMA
578 +---------------------------------------+
579 | Tables |
580 +---------------------------------------+
581 | CHARACTER_SETS |
582+| CLIENT_STATISTICS |
583 | COLLATIONS |
584 | COLLATION_CHARACTER_SET_APPLICABILITY |
585 | COLUMNS |
586 | COLUMN_PRIVILEGES |
587+| INDEX_STATISTICS |
588 | ENGINES |
589 | EVENTS |
590 | FILES |
591 | GLOBAL_STATUS |
592+| GLOBAL_TEMPORARY_TABLES |
593 | GLOBAL_VARIABLES |
594 | KEY_COLUMN_USAGE |
595 | PARAMETERS |
596@@ -139,6 +165,7 @@
597 | PROFILING |
598 | REFERENTIAL_CONSTRAINTS |
599 | ROUTINES |
600+| QUERY_RESPONSE_TIME |
601 | SCHEMATA |
602 | SCHEMA_PRIVILEGES |
603 | SESSION_STATUS |
604@@ -148,16 +175,35 @@
605 | TABLESPACES |
606 | TABLE_CONSTRAINTS |
607 | TABLE_PRIVILEGES |
608+| TABLE_STATISTICS |
609+| TEMPORARY_TABLES |
610+| THREAD_STATISTICS |
611 | TRIGGERS |
612 | USER_PRIVILEGES |
613+| USER_STATISTICS |
614 | VIEWS |
615-| INNODB_CMP_RESET |
616+| INNODB_SYS_COLUMNS |
617+| INNODB_RSEG |
618+| INNODB_CMP |
619 | INNODB_TRX |
620-| INNODB_CMPMEM_RESET |
621+| INNODB_SYS_TABLESTATS |
622 | INNODB_LOCK_WAITS |
623-| INNODB_CMPMEM |
624-| INNODB_CMP |
625+| XTRADB_ADMIN_COMMAND |
626 | INNODB_LOCKS |
627+| INNODB_SYS_FOREIGN_COLS |
628+| INNODB_CMP_RESET |
629+| INNODB_BUFFER_POOL_PAGES |
630+| INNODB_SYS_TABLES |
631+| INNODB_BUFFER_POOL_PAGES_INDEX |
632+| INNODB_CMPMEM |
633+| INNODB_BUFFER_POOL_PAGES_BLOB |
634+| INNODB_CMPMEM_RESET |
635+| INNODB_SYS_FIELDS |
636+| INNODB_TABLE_STATS |
637+| INNODB_SYS_STATS |
638+| INNODB_SYS_FOREIGN |
639+| INNODB_SYS_INDEXES |
640+| INNODB_INDEX_STATS |
641 +---------------------------------------+
642 Wildcard: inf_rmation_schema
643 +--------------------+
644diff -ruN a/mysql-test/r/select.result b/mysql-test/r/select.result
645--- a/mysql-test/r/select.result 2010-11-03 07:01:12.000000000 +0900
646+++ b/mysql-test/r/select.result 2010-12-10 16:48:11.023052909 +0900
647@@ -2196,10 +2196,10 @@
648 select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1;
649 a a
650 1 2
651-2 2
652-3 2
653 1 3
654+2 2
655 2 3
656+3 2
657 3 3
658 select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
659 a a
660diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
661--- a/mysql-test/suite/innodb/r/innodb.result 2010-11-03 07:01:12.000000000 +0900
662+++ b/mysql-test/suite/innodb/r/innodb.result 2010-12-10 16:48:11.026994635 +0900
d8778560 663@@ -1664,7 +1664,7 @@
b4e1fa2c
AM		 664 drop table t1;
665 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
666 variable_value
667-511
668+2047
669 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
670 variable_value
671 16384
672diff -ruN a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
d8778560
AM		 673--- a/mysql-test/suite/sys_vars/r/all_vars.result 2011-01-20 00:37:09.000000000 +0200
674+++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-02-18 13:04:56.205855418 +0200
b4e1fa2c
AM		 675@@ -11,7 +11,99 @@
676 select variable_name as `There should be *no* variables listed below:` from t2
677 left join t1 on variable_name=test_name where test_name is null;
678 There should be *no* variables listed below:
d8778560 679+QUERY_CACHE_STRIP_COMMENTS
b4e1fa2c 680+LOG_SLOW_SP_STATEMENTS
b4e1fa2c
AM		 681+INNODB_THREAD_CONCURRENCY_TIMER_BASED
682+LOG_SLOW_TIMESTAMP_EVERY
d8778560
AM		 683+INNODB_LOG_BLOCK_SIZE
684+THREAD_STATISTICS
b4e1fa2c 685+INNODB_READ_AHEAD
d8778560 686+INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
b4e1fa2c 687+INNODB_PASS_CORRUPT_TABLE
d8778560 688+QUERY_RESPONSE_TIME_STATS
b4e1fa2c
AM		 689+INNODB_FLUSH_NEIGHBOR_PAGES
690+INNODB_BUFFER_POOL_SHM_CHECKSUM
b4e1fa2c 691+LOG_SLOW_VERBOSITY
b4e1fa2c
AM		 692+INNODB_SHOW_LOCKS_HELD
693+INNODB_IBUF_ACCEL_RATE
694+INNODB_EXPAND_IMPORT
b4e1fa2c 695+INNODB_CHECKPOINT_AGE_TARGET
d8778560 696+INNODB_ADAPTIVE_FLUSHING_METHOD
b4e1fa2c 697+INNODB_STATS_METHOD
d8778560 698+HAVE_RESPONSE_TIME_DISTRIBUTION
b4e1fa2c 699+LOG_SLOW_RATE_LIMIT
d8778560 700+OPTIMIZER_FIX
b4e1fa2c 701+INNODB_PAGE_SIZE
b4e1fa2c
AM		 702+FAST_INDEX_CREATION
703+USE_GLOBAL_LOG_SLOW_CONTROL
d8778560 704+INNODB_IBUF_MAX_SIZE
b4e1fa2c
AM		 705+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
706+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP
d8778560
AM		 707+INNODB_BUFFER_POOL_SHM_KEY
708+INNODB_FAST_CHECKSUM
b4e1fa2c
AM		 709+INNODB_USE_SYS_STATS_TABLE
710+INNODB_STATS_UPDATE_NEED_LOCK
d8778560
AM		 711+INNODB_RECOVERY_STATS
712+USERSTAT_RUNNING
b4e1fa2c 713+QUERY_RESPONSE_TIME_RANGE_BASE
b4e1fa2c 714+INNODB_IBUF_ACTIVE_CONTRACT
b4e1fa2c 715+INNODB_AUTO_LRU_DUMP
d8778560
AM		 716+INNODB_DOUBLEWRITE_FILE
717+INNODB_STATS_AUTO_UPDATE
718+INNODB_DICT_SIZE_LIMIT
719 INNODB_FILE_FORMAT_MAX
b4e1fa2c
AM		 720+LOG_WARNINGS_SILENCE
721+LOG_SLOW_FILTER
d8778560 722+INNODB_SHOW_VERBOSE_LOCKS
b4e1fa2c 723+INNODB_EXTRA_RSEGMENTS
d8778560
AM		 724+INNODB_OVERWRITE_RELAY_LOG_INFO
725+LOG_SLOW_SLAVE_STATEMENTS
726+QUERY_CACHE_STRIP_COMMENTS
b4e1fa2c 727+LOG_SLOW_SP_STATEMENTS
b4e1fa2c
AM		 728+INNODB_THREAD_CONCURRENCY_TIMER_BASED
729+LOG_SLOW_TIMESTAMP_EVERY
d8778560
AM		 730+INNODB_LOG_BLOCK_SIZE
731+THREAD_STATISTICS
b4e1fa2c 732+INNODB_READ_AHEAD
d8778560 733+INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
b4e1fa2c 734+INNODB_PASS_CORRUPT_TABLE
d8778560 735+QUERY_RESPONSE_TIME_STATS
b4e1fa2c
AM		 736+INNODB_FLUSH_NEIGHBOR_PAGES
737+INNODB_BUFFER_POOL_SHM_CHECKSUM
b4e1fa2c 738+LOG_SLOW_VERBOSITY
b4e1fa2c
AM		 739+INNODB_SHOW_LOCKS_HELD
740+INNODB_IBUF_ACCEL_RATE
741+INNODB_EXPAND_IMPORT
b4e1fa2c 742+INNODB_CHECKPOINT_AGE_TARGET
d8778560 743+INNODB_ADAPTIVE_FLUSHING_METHOD
b4e1fa2c 744+INNODB_STATS_METHOD
d8778560 745+HAVE_RESPONSE_TIME_DISTRIBUTION
b4e1fa2c 746+LOG_SLOW_RATE_LIMIT
d8778560 747+OPTIMIZER_FIX
b4e1fa2c 748+INNODB_PAGE_SIZE
b4e1fa2c
AM		 749+FAST_INDEX_CREATION
750+USE_GLOBAL_LOG_SLOW_CONTROL
d8778560 751+INNODB_IBUF_MAX_SIZE
b4e1fa2c
AM		 752+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
753+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP
d8778560
AM		 754+INNODB_BUFFER_POOL_SHM_KEY
755+INNODB_FAST_CHECKSUM
b4e1fa2c
AM		 756+INNODB_USE_SYS_STATS_TABLE
757+INNODB_STATS_UPDATE_NEED_LOCK
d8778560
AM		 758+INNODB_RECOVERY_STATS
759+USERSTAT_RUNNING
b4e1fa2c 760+QUERY_RESPONSE_TIME_RANGE_BASE
b4e1fa2c 761+INNODB_IBUF_ACTIVE_CONTRACT
b4e1fa2c 762+INNODB_AUTO_LRU_DUMP
d8778560
AM		 763+INNODB_DOUBLEWRITE_FILE
764+INNODB_STATS_AUTO_UPDATE
765+INNODB_DICT_SIZE_LIMIT
766 INNODB_FILE_FORMAT_MAX
b4e1fa2c
AM		 767+LOG_WARNINGS_SILENCE
768+LOG_SLOW_FILTER
d8778560 769+INNODB_SHOW_VERBOSE_LOCKS
b4e1fa2c 770+INNODB_EXTRA_RSEGMENTS
d8778560
AM		 771+INNODB_OVERWRITE_RELAY_LOG_INFO
772+LOG_SLOW_SLAVE_STATEMENTS
b4e1fa2c
AM		 773 drop table t1;
774 drop table t2;
775diff -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
776--- a/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result 2010-11-03 07:01:13.000000000 +0900
777+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result 2010-12-10 16:48:11.031065741 +0900
778@@ -1,28 +1,28 @@
779 SET @start_global_value = @@global.innodb_adaptive_flushing;
780 SELECT @start_global_value;
781 @start_global_value
782-1
783+0
784 Valid values are 'ON' and 'OFF'
785 select @@global.innodb_adaptive_flushing in (0, 1);
786 @@global.innodb_adaptive_flushing in (0, 1)
787 1
788 select @@global.innodb_adaptive_flushing;
789 @@global.innodb_adaptive_flushing
790-1
791+0
792 select @@session.innodb_adaptive_flushing;
793 ERROR HY000: Variable 'innodb_adaptive_flushing' is a GLOBAL variable
794 show global variables like 'innodb_adaptive_flushing';
795 Variable_name Value
796-innodb_adaptive_flushing ON
797+innodb_adaptive_flushing OFF
798 show session variables like 'innodb_adaptive_flushing';
799 Variable_name Value
800-innodb_adaptive_flushing ON
801+innodb_adaptive_flushing OFF
802 select * from information_schema.global_variables where variable_name='innodb_adaptive_flushing';
803 VARIABLE_NAME VARIABLE_VALUE
804-INNODB_ADAPTIVE_FLUSHING ON
805+INNODB_ADAPTIVE_FLUSHING OFF
806 select * from information_schema.session_variables where variable_name='innodb_adaptive_flushing';
807 VARIABLE_NAME VARIABLE_VALUE
808-INNODB_ADAPTIVE_FLUSHING ON
809+INNODB_ADAPTIVE_FLUSHING OFF
810 set global innodb_adaptive_flushing='OFF';
811 select @@global.innodb_adaptive_flushing;
812 @@global.innodb_adaptive_flushing
813@@ -89,4 +89,4 @@
814 SET @@global.innodb_adaptive_flushing = @start_global_value;
815 SELECT @@global.innodb_adaptive_flushing;
816 @@global.innodb_adaptive_flushing
817-1
818+0
819diff -ruN a/mysql-test/suite/sys_vars/r/plugin_dir_basic.result b/mysql-test/suite/sys_vars/r/plugin_dir_basic.result
820--- a/mysql-test/suite/sys_vars/r/plugin_dir_basic.result 2010-11-03 07:01:13.000000000 +0900
821+++ b/mysql-test/suite/sys_vars/r/plugin_dir_basic.result 2010-12-10 16:48:11.033057415 +0900
822@@ -1,20 +1,20 @@
823 select @@global.plugin_dir;
824 @@global.plugin_dir
825-MYSQL_LIBDIR/plugin
826+MYSQL_LIBDIR64/plugin
827 select @@session.plugin_dir;
828 ERROR HY000: Variable 'plugin_dir' is a GLOBAL variable
829 show global variables like 'plugin_dir';
830 Variable_name Value
831-plugin_dir MYSQL_LIBDIR/plugin
832+plugin_dir MYSQL_LIBDIR64/plugin
833 show session variables like 'plugin_dir';
834 Variable_name Value
835-plugin_dir MYSQL_LIBDIR/plugin
836+plugin_dir MYSQL_LIBDIR64/plugin
837 select * from information_schema.global_variables where variable_name='plugin_dir';
838 VARIABLE_NAME VARIABLE_VALUE
839-PLUGIN_DIR MYSQL_LIBDIR/plugin
840+PLUGIN_DIR MYSQL_LIBDIR64/plugin
841 select * from information_schema.session_variables where variable_name='plugin_dir';
842 VARIABLE_NAME VARIABLE_VALUE
843-PLUGIN_DIR MYSQL_LIBDIR/plugin
844+PLUGIN_DIR MYSQL_LIBDIR64/plugin
845 set global plugin_dir=1;
846 ERROR HY000: Variable 'plugin_dir' is a read only variable
847 set session plugin_dir=1;
848diff -ruN a/mysql-test/t/connect.test b/mysql-test/t/connect.test
849--- a/mysql-test/t/connect.test 2010-11-03 07:01:12.000000000 +0900
850+++ b/mysql-test/t/connect.test 2010-12-10 16:48:11.034065111 +0900
851@@ -1,3 +1,5 @@
852+set global log_warnings=0;
853+
854 # This test is to check various cases of connections
855 # with right and wrong password, with and without database
856 # Unfortunately the check is incomplete as we can't connect without database
857@@ -300,3 +302,4 @@
858 # Wait till all disconnects are completed
859 --source include/wait_until_count_sessions.inc
860
861+set global log_warnings=1;
MySQL: a very fast and reliable SQL database engine
This page took 2.435857 seconds and 4 git commands to generate.