]> 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
- rel 0.5 (consider this to be test before rel 1); update percona patches; drop obsol...
[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
324--- a/mysql-test/r/mysqld--help-notwin.result 2010-12-03 20:58:24.000000000 +0300
325+++ b/mysql-test/r/mysqld--help-notwin.result 2011-01-10 23:34:28.000000000 +0300
326@@ -125,6 +125,9 @@
327 --div-precision-increment=#
328 Precision of the result of '/' operator will be increased
329 on that value
330+ --enable-query-response-time-stats
331+ Enable or disable query response time statisics
332+ collecting
333 --engine-condition-pushdown
334 Push supported query conditions to the storage engine.
335 Deprecated, use --optimizer-switch instead.
336@@ -244,21 +247,43 @@
337 --log-slow-admin-statements
338 Log slow OPTIMIZE, ANALYZE, ALTER and other
339 administrative statements to the slow log if it is open.
340+ --log-slow-filter=name
341+ Log only the queries that followed certain execution
342+ plan. Multiple flags allowed in a comma-separated string.
343+ [qc_miss, full_scan, full_join, tmp_table,
344+ tmp_table_on_disk, filesort, filesort_on_disk]
345 --log-slow-queries[=name]
346 Log slow queries to a table or log file. Defaults logging
347 to table mysql.slow_log or hostname-slow.log if
348 --log-output=file is used. Must be enabled to activate
349 other slow log options. Deprecated option, use
350 --slow-query-log/--slow-query-log-file instead.
351+ --log-slow-rate-limit=#
352+ Rate limit statement writes to slow log to only those
353+ from every (1/log_slow_rate_limit) session.
354 --log-slow-slave-statements
355- Log slow statements executed by slave thread to the slow
356- log if it is open.
357+ Log queries replayed be the slave SQL thread
358+ --log-slow-sp-statements
359+ Log slow statements executed by stored procedure to the
360+ slow log if it is open.
361+ (Defaults to on; use --skip-log-slow-sp-statements to disable.)
362+ --log-slow-timestamp-every
363+ Timestamp is printed for all records of the slow log even
364+ if they are same time.
365+ --log-slow-verbosity=name
366+ Choose how verbose the messages to your slow log will be.
367+ Multiple flags allowed in a comma-separated string.
368+ [microtime, query_plan, innodb, profiling,
369+ profiling_get_rusage]
370 --log-tc=name Path to transaction coordinator log (used for
371 transactions that affect more than one storage engine,
372 when binary log is disabled).
373 --log-tc-size=# Size of transaction coordinator log.
374 -W, --log-warnings[=#]
375 Log some not critical warnings to the log file
376+ --log-warnings-silence=name
377+ disable logging of enumerated warnings: 1592: unsafe
378+ statements for binary logging; possible values : [1592]
379 --long-query-time=# Log all queries that have taken more than long_query_time
380 seconds to execute to file. The argument will be treated
381 as a decimal value with microsecond precision
382@@ -464,6 +489,10 @@
383 The minimum size for blocks allocated by the query cache
384 --query-cache-size=#
385 The memory allocated to store results from old queries
386+ --query-cache-strip-comments
387+ Enable and disable optimisation "strip comment for query
388+ cache" - optimisation strip all comments from query while
389+ search query result in query cache
390 --query-cache-type=name
391 OFF = Don't cache or retrieve results. ON = Cache all
392 results except SELECT SQL_NO_CACHE ... queries. DEMAND =
393@@ -472,6 +501,9 @@
394 Invalidate queries in query cache on LOCK for write
395 --query-prealloc-size=#
396 Persistent buffer for query parsing and execution
397+ --query-response-time-range-base=#
398+ Select base of log for query_response_time ranges.
399+ WARNING: variable change affect only after flush
400 --range-alloc-block-size=#
401 Allocation block size for storing ranges during
402 optimization
403@@ -649,6 +681,9 @@
404 Log slow queries to given log file. Defaults logging to
405 hostname-slow.log. Must be enabled to activate other slow
406 log options
407+ --slow-query-log-microseconds-timestamp
408+ Log slow statements executed by stored procedure to the
409+ slow log if it is open.
410 --socket=name Socket file to use for connection
411 --sort-buffer-size=#
412 Each thread that needs to do a sort allocates a buffer of
413@@ -691,6 +726,8 @@
414 Define threads usage for handling queries, one of
415 one-thread-per-connection, no-threads, loaded-dynamically
416 --thread-stack=# The stack size for each thread
417+ --thread-statistics Control TABLE_STATISTICS running, when userstat_running
418+ is enabled
419 --time-format=name The TIME format (ignored)
420 --timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
421 currently supported)
422@@ -715,11 +752,24 @@
423 Prohibit update of a VIEW, which does not contain a key
424 of the underlying table and the query uses a LIMIT clause
425 (usually get from GUI tools)
426+ --use-global-log-slow-control=name
427+ Choose flags, wich always use the global variables.
428+ Multiple flags allowed in a comma-separated string.
429+ [none, log_slow_filter, log_slow_rate_limit,
430+ log_slow_verbosity, long_query_time,
431+ min_examined_row_limit, all]
432 -u, --user=name Run mysqld daemon as user.
433+ --userstat-running Control USER_STATISTICS, CLIENT_STATISTICS,
434+ THREAD_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS
435+ running
436 -v, --verbose Used with --help option for detailed help.
437 -V, --version Output version information and exit.
438 --wait-timeout=# The number of seconds the server waits for activity on a
439 connection before closing it
440+ --xtradb-admin-command[=name]
441+ Enable or disable XTRADB_ADMIN_COMMAND plugin. Possible
442+ values are ON, OFF, FORCE (don't start if the plugin
443+ fails to load).
444
445 Variables (--variable-name=value)
446 abort-slave-event-count 0
447@@ -756,6 +806,7 @@
448 delayed-queue-size 1000
449 disconnect-slave-event-count 0
450 div-precision-increment 4
451+enable-query-response-time-stats FALSE
452 engine-condition-pushdown TRUE
453 event-scheduler OFF
454 expire-logs-days 0
455@@ -800,10 +851,16 @@
456 log-short-format FALSE
457 log-slave-updates FALSE
458 log-slow-admin-statements FALSE
459+log-slow-filter
460+log-slow-rate-limit 1
461 log-slow-slave-statements FALSE
462+log-slow-sp-statements TRUE
463+log-slow-timestamp-every FALSE
464+log-slow-verbosity
465 log-tc tc.log
466 log-tc-size 24576
467 log-warnings 1
468+log-warnings-silence
469 long-query-time 10
470 low-priority-updates FALSE
471 lower-case-table-names 1
472@@ -877,9 +934,11 @@
473 query-cache-limit 1048576
474 query-cache-min-res-unit 4096
475 query-cache-size 0
476+query-cache-strip-comments FALSE
477 query-cache-type ON
478 query-cache-wlock-invalidate FALSE
479 query-prealloc-size 8192
480+query-response-time-range-base 10
481 range-alloc-block-size 4096
482 read-buffer-size 131072
483 read-only FALSE
484@@ -914,6 +973,7 @@
485 slave-type-conversions
486 slow-launch-time 2
487 slow-query-log FALSE
488+slow-query-log-microseconds-timestamp FALSE
489 sort-buffer-size 2097152
490 sporadic-binlog-dump-fail FALSE
491 sql-mode
492@@ -931,6 +991,7 @@
493 thread-cache-size 0
494 thread-handling one-thread-per-connection
495 thread-stack 262144
496+thread-statistics FALSE
497 time-format %H:%i:%s
498 timed-mutexes FALSE
499 tmp-table-size 16777216
500@@ -938,8 +999,11 @@
501 transaction-isolation REPEATABLE-READ
502 transaction-prealloc-size 4096
503 updatable-views-with-limit YES
504+use-global-log-slow-control
505+userstat-running FALSE
506 verbose TRUE
507 wait-timeout 28800
508+xtradb-admin-command ON
509
510 To see what values a running MySQL server is using, type
511 'mysqladmin variables' instead of 'mysqld --verbose --help'.
512diff -ruN a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
513--- a/mysql-test/r/mysqldump.result 2010-11-03 07:01:12.000000000 +0900
514+++ b/mysql-test/r/mysqldump.result 2010-12-10 16:48:11.013968901 +0900
515@@ -1832,7 +1832,7 @@
516 # Bug#21288 mysqldump segmentation fault when using --where
517 #
518 create table t1 (a int);
519-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)
520+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)
521 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
522
523 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
524diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
525--- a/mysql-test/r/mysqlshow.result 2010-12-03 20:58:24.000000000 +0300
526+++ b/mysql-test/r/mysqlshow.result 2011-01-11 16:41:03.000000000 +0300
527@@ -80,14 +80,17 @@
528 | Tables |
529 +---------------------------------------+
530 | CHARACTER_SETS |
531+| CLIENT_STATISTICS |
532 | COLLATIONS |
533 | COLLATION_CHARACTER_SET_APPLICABILITY |
534 | COLUMNS |
535 | COLUMN_PRIVILEGES |
536+| INDEX_STATISTICS |
537 | ENGINES |
538 | EVENTS |
539 | FILES |
540 | GLOBAL_STATUS |
541+| GLOBAL_TEMPORARY_TABLES |
542 | GLOBAL_VARIABLES |
543 | KEY_COLUMN_USAGE |
544 | PARAMETERS |
545@@ -97,6 +100,7 @@
546 | PROFILING |
547 | REFERENTIAL_CONSTRAINTS |
548 | ROUTINES |
549+| QUERY_RESPONSE_TIME |
550 | SCHEMATA |
551 | SCHEMA_PRIVILEGES |
552 | SESSION_STATUS |
553@@ -106,30 +110,52 @@
554 | TABLESPACES |
555 | TABLE_CONSTRAINTS |
556 | TABLE_PRIVILEGES |
557+| TABLE_STATISTICS |
558+| TEMPORARY_TABLES |
559+| THREAD_STATISTICS |
560 | TRIGGERS |
561 | USER_PRIVILEGES |
562+| USER_STATISTICS |
563 | VIEWS |
564-| INNODB_CMP_RESET |
565+| INNODB_SYS_COLUMNS |
566+| INNODB_RSEG |
567+| INNODB_CMP |
568 | INNODB_TRX |
569-| INNODB_CMPMEM_RESET |
570+| INNODB_SYS_TABLESTATS |
571 | INNODB_LOCK_WAITS |
572-| INNODB_CMPMEM |
573-| INNODB_CMP |
574+| XTRADB_ADMIN_COMMAND |
575 | INNODB_LOCKS |
576+| INNODB_SYS_FOREIGN_COLS |
577+| INNODB_CMP_RESET |
578+| INNODB_BUFFER_POOL_PAGES |
579+| INNODB_SYS_TABLES |
580+| INNODB_BUFFER_POOL_PAGES_INDEX |
581+| INNODB_CMPMEM |
582+| INNODB_BUFFER_POOL_PAGES_BLOB |
583+| INNODB_CMPMEM_RESET |
584+| INNODB_SYS_FIELDS |
585+| INNODB_TABLE_STATS |
586+| INNODB_SYS_STATS |
587+| INNODB_SYS_FOREIGN |
588+| INNODB_SYS_INDEXES |
589+| INNODB_INDEX_STATS |
590 +---------------------------------------+
591 Database: INFORMATION_SCHEMA
592 +---------------------------------------+
593 | Tables |
594 +---------------------------------------+
595 | CHARACTER_SETS |
596+| CLIENT_STATISTICS |
597 | COLLATIONS |
598 | COLLATION_CHARACTER_SET_APPLICABILITY |
599 | COLUMNS |
600 | COLUMN_PRIVILEGES |
601+| INDEX_STATISTICS |
602 | ENGINES |
603 | EVENTS |
604 | FILES |
605 | GLOBAL_STATUS |
606+| GLOBAL_TEMPORARY_TABLES |
607 | GLOBAL_VARIABLES |
608 | KEY_COLUMN_USAGE |
609 | PARAMETERS |
610@@ -139,6 +165,7 @@
611 | PROFILING |
612 | REFERENTIAL_CONSTRAINTS |
613 | ROUTINES |
614+| QUERY_RESPONSE_TIME |
615 | SCHEMATA |
616 | SCHEMA_PRIVILEGES |
617 | SESSION_STATUS |
618@@ -148,16 +175,35 @@
619 | TABLESPACES |
620 | TABLE_CONSTRAINTS |
621 | TABLE_PRIVILEGES |
622+| TABLE_STATISTICS |
623+| TEMPORARY_TABLES |
624+| THREAD_STATISTICS |
625 | TRIGGERS |
626 | USER_PRIVILEGES |
627+| USER_STATISTICS |
628 | VIEWS |
629-| INNODB_CMP_RESET |
630+| INNODB_SYS_COLUMNS |
631+| INNODB_RSEG |
632+| INNODB_CMP |
633 | INNODB_TRX |
634-| INNODB_CMPMEM_RESET |
635+| INNODB_SYS_TABLESTATS |
636 | INNODB_LOCK_WAITS |
637-| INNODB_CMPMEM |
638-| INNODB_CMP |
639+| XTRADB_ADMIN_COMMAND |
640 | INNODB_LOCKS |
641+| INNODB_SYS_FOREIGN_COLS |
642+| INNODB_CMP_RESET |
643+| INNODB_BUFFER_POOL_PAGES |
644+| INNODB_SYS_TABLES |
645+| INNODB_BUFFER_POOL_PAGES_INDEX |
646+| INNODB_CMPMEM |
647+| INNODB_BUFFER_POOL_PAGES_BLOB |
648+| INNODB_CMPMEM_RESET |
649+| INNODB_SYS_FIELDS |
650+| INNODB_TABLE_STATS |
651+| INNODB_SYS_STATS |
652+| INNODB_SYS_FOREIGN |
653+| INNODB_SYS_INDEXES |
654+| INNODB_INDEX_STATS |
655 +---------------------------------------+
656 Wildcard: inf_rmation_schema
657 +--------------------+
658diff -ruN a/mysql-test/r/select.result b/mysql-test/r/select.result
659--- a/mysql-test/r/select.result 2010-11-03 07:01:12.000000000 +0900
660+++ b/mysql-test/r/select.result 2010-12-10 16:48:11.023052909 +0900
661@@ -2196,10 +2196,10 @@
662 select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1;
663 a a
664 1 2
665-2 2
666-3 2
667 1 3
668+2 2
669 2 3
670+3 2
671 3 3
672 select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
673 a a
674diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
675--- a/mysql-test/suite/innodb/r/innodb.result 2010-11-03 07:01:12.000000000 +0900
676+++ b/mysql-test/suite/innodb/r/innodb.result 2010-12-10 16:48:11.026994635 +0900
677@@ -1661,7 +1661,7 @@
678 drop table t1;
679 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
680 variable_value
681-511
682+2047
683 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
684 variable_value
685 16384
686diff -ruN a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
687--- a/mysql-test/suite/sys_vars/r/all_vars.result 2010-12-03 20:58:25.000000000 +0300
688+++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-01-10 23:09:13.000000000 +0300
689@@ -11,7 +11,99 @@
690 select variable_name as `There should be *no* variables listed below:` from t2
691 left join t1 on variable_name=test_name where test_name is null;
692 There should be *no* variables listed below:
693+INNODB_BUFFER_POOL_SHM_KEY
694+LOG_SLOW_SP_STATEMENTS
695+INNODB_DOUBLEWRITE_FILE
696+INNODB_THREAD_CONCURRENCY_TIMER_BASED
697+LOG_SLOW_TIMESTAMP_EVERY
698+INNODB_READ_AHEAD
699+INNODB_PASS_CORRUPT_TABLE
700+INNODB_RECOVERY_STATS
701+INNODB_FLUSH_NEIGHBOR_PAGES
702+INNODB_BUFFER_POOL_SHM_CHECKSUM
703+INNODB_FLUSH_LOG_AT_TRX_COMMIT_SESSION
704+LOG_SLOW_VERBOSITY
705+ENABLE_QUERY_RESPONSE_TIME_STATS
706+OPTIMIZER_FIX
707+INNODB_ADAPTIVE_CHECKPOINT
708+INNODB_SHOW_LOCKS_HELD
709+INNODB_IBUF_ACCEL_RATE
710+INNODB_EXPAND_IMPORT
711+QUERY_CACHE_STRIP_COMMENTS
712+INNODB_CHECKPOINT_AGE_TARGET
713+INNODB_STATS_METHOD
714+LOG_SLOW_RATE_LIMIT
715+INNODB_PAGE_SIZE
716+USERSTAT_RUNNING
717+FAST_INDEX_CREATION
718+USE_GLOBAL_LOG_SLOW_CONTROL
719+INNODB_ENABLE_UNSAFE_GROUP_COMMIT
720+INNODB_SHOW_VERBOSE_LOCKS
721+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
722+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP
723+INNODB_LOG_BLOCK_SIZE
724+INNODB_USE_SYS_STATS_TABLE
725+INNODB_STATS_UPDATE_NEED_LOCK
726+QUERY_RESPONSE_TIME_RANGE_BASE
727+INNODB_STATS_AUTO_UPDATE
728+INNODB_IBUF_ACTIVE_CONTRACT
729 INNODB_FILE_FORMAT_MAX
730+INNODB_AUTO_LRU_DUMP
731+LOG_WARNINGS_SILENCE
732+LOG_SLOW_FILTER
733+INNODB_DICT_SIZE_LIMIT
734+INNODB_IBUF_MAX_SIZE
735+INNODB_FAST_CHECKSUM
736+LOG_SLOW_SLAVE_STATEMENTS
737+INNODB_OVERWRITE_RELAY_LOG_INFO
738+INNODB_EXTRA_RSEGMENTS
739+THREAD_STATISTICS
740+INNODB_BUFFER_POOL_SHM_KEY
741+LOG_SLOW_SP_STATEMENTS
742+INNODB_DOUBLEWRITE_FILE
743+INNODB_THREAD_CONCURRENCY_TIMER_BASED
744+LOG_SLOW_TIMESTAMP_EVERY
745+INNODB_READ_AHEAD
746+INNODB_PASS_CORRUPT_TABLE
747+INNODB_RECOVERY_STATS
748+INNODB_FLUSH_NEIGHBOR_PAGES
749+INNODB_BUFFER_POOL_SHM_CHECKSUM
750+INNODB_FLUSH_LOG_AT_TRX_COMMIT_SESSION
751+LOG_SLOW_VERBOSITY
752+ENABLE_QUERY_RESPONSE_TIME_STATS
753+OPTIMIZER_FIX
754+INNODB_ADAPTIVE_CHECKPOINT
755+INNODB_SHOW_LOCKS_HELD
756+INNODB_IBUF_ACCEL_RATE
757+INNODB_EXPAND_IMPORT
758+QUERY_CACHE_STRIP_COMMENTS
759+INNODB_CHECKPOINT_AGE_TARGET
760+INNODB_STATS_METHOD
761+LOG_SLOW_RATE_LIMIT
762+INNODB_PAGE_SIZE
763+USERSTAT_RUNNING
764+FAST_INDEX_CREATION
765+USE_GLOBAL_LOG_SLOW_CONTROL
766+INNODB_ENABLE_UNSAFE_GROUP_COMMIT
767+INNODB_SHOW_VERBOSE_LOCKS
768+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
769+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP
770+INNODB_LOG_BLOCK_SIZE
771+INNODB_USE_SYS_STATS_TABLE
772+INNODB_STATS_UPDATE_NEED_LOCK
773+QUERY_RESPONSE_TIME_RANGE_BASE
774+INNODB_STATS_AUTO_UPDATE
775+INNODB_IBUF_ACTIVE_CONTRACT
776 INNODB_FILE_FORMAT_MAX
777+INNODB_AUTO_LRU_DUMP
778+LOG_WARNINGS_SILENCE
779+LOG_SLOW_FILTER
780+INNODB_DICT_SIZE_LIMIT
781+INNODB_IBUF_MAX_SIZE
782+INNODB_FAST_CHECKSUM
783+LOG_SLOW_SLAVE_STATEMENTS
784+INNODB_OVERWRITE_RELAY_LOG_INFO
785+INNODB_EXTRA_RSEGMENTS
786+THREAD_STATISTICS
787 drop table t1;
788 drop table t2;
789diff -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
790--- a/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result 2010-11-03 07:01:13.000000000 +0900
791+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result 2010-12-10 16:48:11.031065741 +0900
792@@ -1,28 +1,28 @@
793 SET @start_global_value = @@global.innodb_adaptive_flushing;
794 SELECT @start_global_value;
795 @start_global_value
796-1
797+0
798 Valid values are 'ON' and 'OFF'
799 select @@global.innodb_adaptive_flushing in (0, 1);
800 @@global.innodb_adaptive_flushing in (0, 1)
801 1
802 select @@global.innodb_adaptive_flushing;
803 @@global.innodb_adaptive_flushing
804-1
805+0
806 select @@session.innodb_adaptive_flushing;
807 ERROR HY000: Variable 'innodb_adaptive_flushing' is a GLOBAL variable
808 show global variables like 'innodb_adaptive_flushing';
809 Variable_name Value
810-innodb_adaptive_flushing ON
811+innodb_adaptive_flushing OFF
812 show session variables like 'innodb_adaptive_flushing';
813 Variable_name Value
814-innodb_adaptive_flushing ON
815+innodb_adaptive_flushing OFF
816 select * from information_schema.global_variables where variable_name='innodb_adaptive_flushing';
817 VARIABLE_NAME VARIABLE_VALUE
818-INNODB_ADAPTIVE_FLUSHING ON
819+INNODB_ADAPTIVE_FLUSHING OFF
820 select * from information_schema.session_variables where variable_name='innodb_adaptive_flushing';
821 VARIABLE_NAME VARIABLE_VALUE
822-INNODB_ADAPTIVE_FLUSHING ON
823+INNODB_ADAPTIVE_FLUSHING OFF
824 set global innodb_adaptive_flushing='OFF';
825 select @@global.innodb_adaptive_flushing;
826 @@global.innodb_adaptive_flushing
827@@ -89,4 +89,4 @@
828 SET @@global.innodb_adaptive_flushing = @start_global_value;
829 SELECT @@global.innodb_adaptive_flushing;
830 @@global.innodb_adaptive_flushing
831-1
832+0
833diff -ruN a/mysql-test/suite/sys_vars/r/plugin_dir_basic.result b/mysql-test/suite/sys_vars/r/plugin_dir_basic.result
834--- a/mysql-test/suite/sys_vars/r/plugin_dir_basic.result 2010-11-03 07:01:13.000000000 +0900
835+++ b/mysql-test/suite/sys_vars/r/plugin_dir_basic.result 2010-12-10 16:48:11.033057415 +0900
836@@ -1,20 +1,20 @@
837 select @@global.plugin_dir;
838 @@global.plugin_dir
839-MYSQL_LIBDIR/plugin
840+MYSQL_LIBDIR64/plugin
841 select @@session.plugin_dir;
842 ERROR HY000: Variable 'plugin_dir' is a GLOBAL variable
843 show global variables like 'plugin_dir';
844 Variable_name Value
845-plugin_dir MYSQL_LIBDIR/plugin
846+plugin_dir MYSQL_LIBDIR64/plugin
847 show session variables like 'plugin_dir';
848 Variable_name Value
849-plugin_dir MYSQL_LIBDIR/plugin
850+plugin_dir MYSQL_LIBDIR64/plugin
851 select * from information_schema.global_variables where variable_name='plugin_dir';
852 VARIABLE_NAME VARIABLE_VALUE
853-PLUGIN_DIR MYSQL_LIBDIR/plugin
854+PLUGIN_DIR MYSQL_LIBDIR64/plugin
855 select * from information_schema.session_variables where variable_name='plugin_dir';
856 VARIABLE_NAME VARIABLE_VALUE
857-PLUGIN_DIR MYSQL_LIBDIR/plugin
858+PLUGIN_DIR MYSQL_LIBDIR64/plugin
859 set global plugin_dir=1;
860 ERROR HY000: Variable 'plugin_dir' is a read only variable
861 set session plugin_dir=1;
862diff -ruN a/mysql-test/t/connect.test b/mysql-test/t/connect.test
863--- a/mysql-test/t/connect.test 2010-11-03 07:01:12.000000000 +0900
864+++ b/mysql-test/t/connect.test 2010-12-10 16:48:11.034065111 +0900
865@@ -1,3 +1,5 @@
866+set global log_warnings=0;
867+
868 # This test is to check various cases of connections
869 # with right and wrong password, with and without database
870 # Unfortunately the check is incomplete as we can't connect without database
871@@ -300,3 +302,4 @@
872 # Wait till all disconnects are completed
873 --source include/wait_until_count_sessions.inc
874
875+set global log_warnings=1;
MySQL: a very fast and reliable SQL database engine
This page took 0.21564 seconds and 4 git commands to generate.