PBXT

Merge lp:~vkolesnikov/pbxt/pbxt-5.1.35-upgrade into lp:pbxt

  1. pbxt-5.1.35-upgrade
  2. Merge into trunk
Proposed by Vladimir Kolesnikov
Status: Merged
Merged at revision: not available
Proposed branch: lp:~vkolesnikov/pbxt/pbxt-5.1.35-upgrade
Merge into: lp:pbxt
Diff against target: None lines
To merge this branch: bzr merge lp:~vkolesnikov/pbxt/pbxt-5.1.35-upgrade
Reviewer Review Type Date Requested Status
PBXT Core Pending
Review via email: mp+7550@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vladimir Kolesnikov (vkolesnikov) wrote :

tests passed on local 32-bit ubuntu and dev8

Revision history for this message
Paul McCullagh (paul-mccullagh) wrote :

Hi Vlad,

Could you please add a release note. Something like:

PBXT now compiles and runs with MySQL 5.1.35. All tests pass.

Later we can add something like (to the same release note):

PBXT also compiles and has been tested with MySQL 5.4.x.

On Jun 17, 2009, at 3:15 PM, Vladimir Kolesnikov wrote:

> Vladimir Kolesnikov has proposed merging lp:~vkolesnikov/pbxt/
> pbxt-5.1.35-upgrade into lp:pbxt.
>
> Requested reviews:
> PBXT Core (pbxt-core)
>
> tests passed on local 32-bit ubuntu and dev8
> --
> https://code.launchpad.net/~vkolesnikov/pbxt/pbxt-5.1.35-upgrade/
> +merge/7550
> Your team PBXT Core is subscribed to branch lp:pbxt.
> === added file 'test/mysql-test/include/count_sessions.inc'
> --- test/mysql-test/include/count_sessions.inc 1970-01-01 00:00:00
> +0000
> +++ test/mysql-test/include/count_sessions.inc 2009-06-02 18:38:30
> +0000

--
Paul McCullagh
PrimeBase Technologies
www.primebase.org
www.blobstreaming.org
pbxt.blogspot.com

Revision history for this message
Vladimir Kolesnikov (vkolesnikov) wrote :

of course I forgot about it, sorry. Pushed.

Paul McCullagh wrote:
> Hi Vlad,
>
> Could you please add a release note. Something like:
>
> PBXT now compiles and runs with MySQL 5.1.35. All tests pass.
>
> Later we can add something like (to the same release note):
>
> PBXT also compiles and has been tested with MySQL 5.4.x.
>
> On Jun 17, 2009, at 3:15 PM, Vladimir Kolesnikov wrote:
>
>
>> Vladimir Kolesnikov has proposed merging lp:~vkolesnikov/pbxt/
>> pbxt-5.1.35-upgrade into lp:pbxt.
>>
>> Requested reviews:
>> PBXT Core (pbxt-core)
>>
>> tests passed on local 32-bit ubuntu and dev8
>> --
>> https://code.launchpad.net/~vkolesnikov/pbxt/pbxt-5.1.35-upgrade/
>> +merge/7550
>> Your team PBXT Core is subscribed to branch lp:pbxt.
>> === added file 'test/mysql-test/include/count_sessions.inc'
>> --- test/mysql-test/include/count_sessions.inc 1970-01-01 00:00:00
>> +0000
>> +++ test/mysql-test/include/count_sessions.inc 2009-06-02 18:38:30
>> +0000
>>
>
>
>
> --
> Paul McCullagh
> PrimeBase Technologies
> www.primebase.org
> www.blobstreaming.org
> pbxt.blogspot.com
>
>
>
>

--
--
Best Regards,
Vladimir

lp:~vkolesnikov/pbxt/pbxt-5.1.35-upgrade updated
659. By Paul McCullagh

Merged RN248

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'test/mysql-test/include/count_sessions.inc'
2--- test/mysql-test/include/count_sessions.inc 1970-01-01 00:00:00 +0000
3+++ test/mysql-test/include/count_sessions.inc 2009-06-02 18:38:30 +0000
4@@ -0,0 +1,21 @@
5+# include/count_sessions.inc
6+#
7+# SUMMARY
8+#
9+# Stores the number of current sessions in $count_sessions.
10+#
11+#
12+# USAGE
13+#
14+# Please look into include/wait_until_count_sessions.inc
15+# for examples of typical usage.
16+#
17+#
18+# EXAMPLE
19+# backup.test, grant3.test
20+#
21+#
22+# Created: 2009-01-14 mleich
23+#
24+
25+let $count_sessions= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1);
26
27=== modified file 'test/mysql-test/include/mysqltest-x.inc'
28--- test/mysql-test/include/mysqltest-x.inc 2006-10-23 09:14:04 +0000
29+++ test/mysql-test/include/mysqltest-x.inc 2009-06-02 18:38:30 +0000
30@@ -1,2 +1,3 @@
31 echo Output from mysqltest-x.inc;
32+exit;
33
34
35=== modified file 'test/mysql-test/include/ps_modify.inc'
36--- test/mysql-test/include/ps_modify.inc 2008-06-09 12:49:32 +0000
37+++ test/mysql-test/include/ps_modify.inc 2009-06-02 20:26:05 +0000
38@@ -108,7 +108,6 @@
39 select a,b from t1 where a=@arg00;
40 set @arg00=NULL;
41 set @arg01=2;
42---error 1048
43 execute stmt1 using @arg00, @arg01;
44 select a,b from t1 order by a;
45 set @arg00=0;
46
47=== added file 'test/mysql-test/include/wait_until_count_sessions.inc'
48--- test/mysql-test/include/wait_until_count_sessions.inc 1970-01-01 00:00:00 +0000
49+++ test/mysql-test/include/wait_until_count_sessions.inc 2009-06-02 18:38:30 +0000
50@@ -0,0 +1,126 @@
51+# include/wait_until_count_sessions.inc
52+#
53+# SUMMARY
54+#
55+# Waits until the passed number ($count_sessions) of concurrent sessions or
56+# a smaller number was observed via
57+# SHOW STATUS LIKE 'Threads_connected'
58+# or the operation times out.
59+# Note:
60+# 1. We wait for $current_sessions <= $count_sessions because in the use case
61+# with count_sessions.inc before and wait_until_count_sessions.inc after
62+# the core of the test it could happen that the disconnects of sessions
63+# belonging to the preceeding test are not finished.
64+# sessions at test begin($count_sessions) = m + n
65+# sessions of the previous test which will be soon disconnected = n (n >= 0)
66+# sessions at test end ($current sessions, assuming the test disconnects
67+# all additional sessions) = m
68+# 2. Starting with 5.1 we could also use
69+# SELECT COUNT(*) FROM information_schema.processlist
70+# I stay with "SHOW STATUS LIKE 'Threads_connected'" because this
71+# runs in all versions 5.0+
72+#
73+#
74+# USAGE
75+#
76+# let $count_sessions= 3;
77+# --source include/wait_until_count_sessions.inc
78+#
79+# OR typical example of a test which uses more than one session
80+# Such a test could harm successing tests if there is no server shutdown
81+# and start between.
82+#
83+# If the testing box is slow than the disconnect of sessions belonging to
84+# the current test might happen when the successing test gets executed.
85+# This means the successing test might see activities like unexpected
86+# rows within the general log or the PROCESSLIST.
87+# Example from bug http://bugs.mysql.com/bug.php?id=40377
88+# --- bzr_mysql-6.0-rpl/.../r/log_state.result
89+# +++ bzr_mysql-6.0-rpl/.../r/log_state.reject
90+# @@ -25,6 +25,7 @@
91+# event_time user_host ... command_type argument
92+# TIMESTAMP USER_HOST ... Query create table t1(f1 int)
93+# TIMESTAMP USER_HOST ... Query select * from mysql.general_log
94+# +TIMESTAMP USER_HOST ... Quit
95+# ....
96+#
97+# What to do?
98+# -----------
99+# <start of test>
100+# # Determine initial number of connections (set $count_sessions)
101+# --source include/count_sessions.inc
102+# ...
103+# connect (con1,.....)
104+# ...
105+# connection default;
106+# ...
107+# disconnect con1;
108+# ...
109+# # Wait until we have reached the initial number of connections
110+# # or more than the sleep time above (10 seconds) has passed.
111+# # $count_sessions
112+# --source include/wait_until_count_sessions.inc
113+# <end of test>
114+#
115+# Important note about tests with unfortunate (= not cooperative
116+# to successing tests) architecture:
117+# connection con1;
118+# send SELECT ..., sleep(10)
119+# connection default;
120+# ...
121+# disconnect con1;
122+# <end of test>
123+# should be fixed by
124+# connection con1;
125+# send SELECT ..., sleep(10)
126+# connection default;
127+# ...
128+# connect con1;
129+# reap;
130+# connection default;
131+# disconnect con1;
132+# <end of test>
133+# and not only by appending include/wait_until_count_sessions.inc etc.
134+#
135+#
136+# EXAMPLE
137+#
138+# backup.test, grant3.test
139+#
140+#
141+# Created:
142+# 2009-01-14 mleich
143+# Modified:
144+# 2009-02-24 mleich Fix Bug#43114 wait_until_count_sessions too restrictive,
145+# random PB failures
146+#
147+
148+let $wait_counter= 100;
149+if ($wait_timeout)
150+{
151+ let $wait_counter= `SELECT $wait_timeout * 10`;
152+}
153+# Reset $wait_timeout so that its value won't be used on subsequent
154+# calls, and default will be used instead.
155+let $wait_timeout= 0;
156+while ($wait_counter)
157+{
158+ let $current_sessions= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1);
159+ let $success= `SELECT $current_sessions <= $count_sessions`;
160+ if ($success)
161+ {
162+ let $wait_counter= 0;
163+ }
164+ if (!$success)
165+ {
166+ real_sleep 0.1;
167+ dec $wait_counter;
168+ }
169+}
170+if (!$success)
171+{
172+ --echo # Timeout in wait_until_count_sessions.inc
173+ --echo # Number of sessions expected: <= $count_sessions found: $current_sessions
174+ SHOW PROCESSLIST;
175+}
176+
177
178=== modified file 'test/mysql-test/r/auto_increment.result'
179--- test/mysql-test/r/auto_increment.result 2009-03-27 20:05:34 +0000
180+++ test/mysql-test/r/auto_increment.result 2009-06-02 00:08:42 +0000
181@@ -229,7 +229,8 @@
182 204 7
183 delete from t1 where a=0;
184 update t1 set a=NULL where b=6;
185-ERROR 23000: Column 'a' cannot be null
186+Warnings:
187+Warning 1048 Column 'a' cannot be null
188 update t1 set a=300 where b=7;
189 SET SQL_MODE='';
190 insert into t1(a,b)values(NULL,8);
191@@ -244,7 +245,7 @@
192 1 1
193 200 2
194 201 4
195-203 6
196+0 6
197 300 7
198 301 8
199 400 9
200@@ -260,7 +261,6 @@
201 1 1
202 200 2
203 201 4
204-203 6
205 300 7
206 301 8
207 400 9
208@@ -271,20 +271,20 @@
209 405 14
210 delete from t1 where a=0;
211 update t1 set a=NULL where b=13;
212-ERROR 23000: Column 'a' cannot be null
213+Warnings:
214+Warning 1048 Column 'a' cannot be null
215 update t1 set a=500 where b=14;
216 select * from t1 order by b;
217 a b
218 1 1
219 200 2
220 201 4
221-203 6
222 300 7
223 301 8
224 400 9
225 401 10
226 402 11
227-404 13
228+0 13
229 500 14
230 drop table t1;
231 create table t1 (a bigint);
232
233=== modified file 'test/mysql-test/r/binlog_stm_ctype_ucs.result'
234--- test/mysql-test/r/binlog_stm_ctype_ucs.result 2008-11-05 15:56:49 +0000
235+++ test/mysql-test/r/binlog_stm_ctype_ucs.result 2009-06-02 00:12:43 +0000
236@@ -17,7 +17,7 @@
237 use test/*!*/;
238 SET TIMESTAMP=10000/*!*/;
239 SET @@session.pseudo_thread_id=999999999/*!*/;
240-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;
241+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
242 SET @@session.sql_mode=0/*!*/;
243 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
244 /*!\C latin1 *//*!*/;
245
246=== modified file 'test/mysql-test/r/func_compress.result'
247--- test/mysql-test/r/func_compress.result 2007-01-29 15:04:29 +0000
248+++ test/mysql-test/r/func_compress.result 2009-06-02 00:20:29 +0000
249@@ -68,10 +68,11 @@
250 Error 1259 ZLIB: Input data corrupted
251 Error 1256 Uncompressed data size too large; the maximum size is 1048576 (probably, length of uncompressed data was corrupted)
252 drop table t1;
253-set @@max_allowed_packet=1048576*100;
254+set @@global.max_allowed_packet=1048576*100;
255 select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null;
256 compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null
257 0
258+set @@global.max_allowed_packet=default;
259 create table t1(a blob);
260 insert into t1 values(NULL), (compress('a'));
261 select uncompress(a), uncompressed_length(a) from t1;
262
263=== modified file 'test/mysql-test/r/func_group.result'
264--- test/mysql-test/r/func_group.result 2009-04-03 19:39:12 +0000
265+++ test/mysql-test/r/func_group.result 2009-06-02 00:58:37 +0000
266@@ -61,7 +61,7 @@
267 NULL NULL
268 1 7
269 2 20.25
270-3 45.483163247594
271+3 45.4831632475944
272 create table t2 (grp int, a bigint unsigned, c char(10));
273 insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp;
274 replace into t2 select grp, a, c from t1 limit 2,1;
275@@ -1186,7 +1186,7 @@
276 0.21325764
277 select std(o1/o2) from bug22555;
278 std(o1/o2)
279-0.21325763586649
280+0.213257635866493
281 select std(e1/e2) from bug22555;
282 std(e1/e2)
283 0.21325764
284@@ -1212,7 +1212,7 @@
285 0.21325763586649341
286 select std(o1/o2) from bug22555;
287 std(o1/o2)
288-0.21325763586649
289+0.213257635866493
290 select round(std(e1/e2), 17) from bug22555;
291 round(std(e1/e2), 17)
292 0.21325763586649341
293@@ -1237,7 +1237,7 @@
294 0.21325763586649341
295 select std(o1/o2) from bug22555;
296 std(o1/o2)
297-0.21325763586649
298+0.213257635866493
299 select round(std(e1/e2), 17) from bug22555;
300 round(std(e1/e2), 17)
301 0.21325763586649341
302
303=== modified file 'test/mysql-test/r/func_math.result'
304--- test/mysql-test/r/func_math.result 2008-03-10 11:36:34 +0000
305+++ test/mysql-test/r/func_math.result 2009-06-02 00:58:37 +0000
306@@ -60,7 +60,7 @@
307 Note 1003 select ln(exp(10)) AS `ln(exp(10))`,exp((ln(sqrt(10)) * 2)) AS `exp(ln(sqrt(10))*2)`,ln(-(1)) AS `ln(-1)`,ln(0) AS `ln(0)`,ln(NULL) AS `ln(NULL)`
308 select log2(8),log2(15),log2(-2),log2(0),log2(NULL);
309 log2(8) log2(15) log2(-2) log2(0) log2(NULL)
310-3 3.9068905956085 NULL NULL NULL
311+3 3.90689059560852 NULL NULL NULL
312 explain extended select log2(8),log2(15),log2(-2),log2(0),log2(NULL);
313 id select_type table type possible_keys key key_len ref rows filtered Extra
314 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
315@@ -68,7 +68,7 @@
316 Note 1003 select log2(8) AS `log2(8)`,log2(15) AS `log2(15)`,log2(-(2)) AS `log2(-2)`,log2(0) AS `log2(0)`,log2(NULL) AS `log2(NULL)`
317 select log10(100),log10(18),log10(-4),log10(0),log10(NULL);
318 log10(100) log10(18) log10(-4) log10(0) log10(NULL)
319-2 1.2552725051033 NULL NULL NULL
320+2 1.25527250510331 NULL NULL NULL
321 explain extended select log10(100),log10(18),log10(-4),log10(0),log10(NULL);
322 id select_type table type possible_keys key key_len ref rows filtered Extra
323 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
324@@ -85,7 +85,7 @@
325 set @@rand_seed1=10000000,@@rand_seed2=1000000;
326 select rand(999999),rand();
327 rand(999999) rand()
328-0.014231365187309 0.028870999839968
329+0.0142313651873091 0.028870999839968
330 explain extended select rand(999999),rand();
331 id select_type table type possible_keys key key_len ref rows filtered Extra
332 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
333@@ -101,7 +101,7 @@
334 Note 1003 select pi() AS `pi()`,format(sin((pi() / 2)),6) AS `format(sin(pi()/2),6)`,format(cos((pi() / 2)),6) AS `format(cos(pi()/2),6)`,format(abs(tan(pi())),6) AS `format(abs(tan(pi())),6)`,format((1 / tan(1)),6) AS `format(cot(1),6)`,format(asin(1),6) AS `format(asin(1),6)`,format(acos(0),6) AS `format(acos(0),6)`,format(atan(1),6) AS `format(atan(1),6)`
335 select degrees(pi()),radians(360);
336 degrees(pi()) radians(360)
337-180 6.2831853071796
338+180 6.28318530717959
339 select format(atan(-2, 2), 6);
340 format(atan(-2, 2), 6)
341 -0.785398
342
343=== modified file 'test/mysql-test/r/func_str.result'
344--- test/mysql-test/r/func_str.result 2009-03-27 20:05:34 +0000
345+++ test/mysql-test/r/func_str.result 2009-06-02 00:58:37 +0000
346@@ -717,8 +717,6 @@
347 replace(_latin2'abcd',_latin2'b',_latin2'B'),
348 encode('abcd','ab')
349 ;
350-Warnings:
351-Warning 1265 Data truncated for column 'format(130,10)' at row 1
352 show create table t1;
353 Table Create Table
354 t1 CREATE TABLE `t1` (
355@@ -727,7 +725,7 @@
356 `conv(130,16,10)` varchar(64) DEFAULT NULL,
357 `hex(130)` varchar(6) NOT NULL DEFAULT '',
358 `char(130)` varbinary(4) NOT NULL DEFAULT '',
359- `format(130,10)` varchar(4) NOT NULL DEFAULT '',
360+ `format(130,10)` varchar(37) NOT NULL DEFAULT '',
361 `left(_latin2'a',1)` varchar(1) CHARACTER SET latin2 NOT NULL DEFAULT '',
362 `right(_latin2'a',1)` varchar(1) CHARACTER SET latin2 NOT NULL DEFAULT '',
363 `lcase(_latin2'a')` varchar(1) CHARACTER SET latin2 NOT NULL DEFAULT '',
364@@ -1329,10 +1327,10 @@
365 20.06
366 select conv("18383815659218730760",10,10) + 0;
367 conv("18383815659218730760",10,10) + 0
368-1.8383815659219e+19
369+1.83838156592187e+19
370 select "18383815659218730760" + 0;
371 "18383815659218730760" + 0
372-1.8383815659219e+19
373+1.83838156592187e+19
374 CREATE TABLE t1 (code varchar(10));
375 INSERT INTO t1 VALUES ('a12'), ('A12'), ('a13');
376 SELECT ASCII(code), code FROM t1 WHERE code='A12';
377
378=== modified file 'test/mysql-test/r/grant.result'
379--- test/mysql-test/r/grant.result 2008-03-28 10:24:43 +0000
380+++ test/mysql-test/r/grant.result 2009-06-02 01:40:43 +0000
381@@ -457,7 +457,7 @@
382 Alter Tables To alter the table
383 Alter routine Functions,Procedures To alter or drop stored functions/procedures
384 Create Databases,Tables,Indexes To create new databases and tables
385-Create routine Functions,Procedures To use CREATE FUNCTION/PROCEDURE
386+Create routine Databases To use CREATE FUNCTION/PROCEDURE
387 Create temporary tables Databases To use CREATE TEMPORARY TABLE
388 Create view Tables To create new views
389 Create user Server Admin To create new users
390
391=== modified file 'test/mysql-test/r/information_schema_db.result'
392--- test/mysql-test/r/information_schema_db.result 2008-11-14 17:55:06 +0000
393+++ test/mysql-test/r/information_schema_db.result 2009-06-02 01:42:27 +0000
394@@ -201,7 +201,7 @@
395 f1 char(4) YES NULL
396 show create view v2;
397 View Create View character_set_client collation_connection
398-v2 CREATE ALGORITHM=UNDEFINED DEFINER=`testdb_2`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v2` AS select `v1`.`f1` AS `f1` from `testdb_1`.`v1` latin1 latin1_swedish_ci
399+v2 CREATE ALGORITHM=UNDEFINED DEFINER=`testdb_2`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `v1`.`f1` AS `f1` from `testdb_1`.`v1` latin1 latin1_swedish_ci
400 show create view testdb_1.v1;
401 ERROR 42000: SHOW VIEW command denied to user 'testdb_2'@'localhost' for table 'v1'
402 select table_name from information_schema.columns a
403
404=== modified file 'test/mysql-test/r/information_schema_part.result'
405--- test/mysql-test/r/information_schema_part.result 2008-05-21 12:07:14 +0000
406+++ test/mysql-test/r/information_schema_part.result 2009-06-02 01:44:36 +0000
407@@ -119,7 +119,10 @@
408 Table Create Table
409 t1 CREATE TABLE `t1` (
410 `a` int(11) DEFAULT NULL
411-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY LINEAR HASH (a) (PARTITION p0 VALUES LESS THAN (10) ENGINE = PBXT) */
412+) ENGINE=PBXT DEFAULT CHARSET=latin1
413+/*!50100 PARTITION BY RANGE (a)
414+SUBPARTITION BY LINEAR HASH (a)
415+(PARTITION p0 VALUES LESS THAN (10) ENGINE = PBXT) */
416 select SUBPARTITION_METHOD FROM information_schema.partitions WHERE
417 table_schema="test" AND table_name="t1";
418 SUBPARTITION_METHOD
419@@ -134,7 +137,9 @@
420 Table Create Table
421 t1 CREATE TABLE `t1` (
422 `a` int(11) DEFAULT NULL
423-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (a) (PARTITION p0 VALUES IN (10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53) ENGINE = PBXT) */
424+) ENGINE=PBXT DEFAULT CHARSET=latin1
425+/*!50100 PARTITION BY LIST (a)
426+(PARTITION p0 VALUES IN (10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53) ENGINE = PBXT) */
427 SELECT PARTITION_DESCRIPTION FROM information_schema.partitions WHERE
428 table_schema = "test" AND table_name = "t1";
429 PARTITION_DESCRIPTION
430
431=== modified file 'test/mysql-test/r/key_cache.result'
432--- test/mysql-test/r/key_cache.result 2009-04-03 19:39:12 +0000
433+++ test/mysql-test/r/key_cache.result 2009-06-02 01:59:10 +0000
434@@ -257,8 +257,6 @@
435 drop table t1,t2,t3;
436 set global keycache2.key_buffer_size=0;
437 set global keycache3.key_buffer_size=100;
438-Warnings:
439-Warning 1292 Truncated incorrect key_buffer_size value: '100'
440 set global keycache3.key_buffer_size=0;
441 create table t1 (mytext text, FULLTEXT (mytext)) engine=myisam;
442 insert t1 values ('aaabbb');
443
444=== modified file 'test/mysql-test/r/myisam-blob.result'
445--- test/mysql-test/r/myisam-blob.result 2007-03-13 19:06:47 +0000
446+++ test/mysql-test/r/myisam-blob.result 2009-06-02 17:54:03 +0000
447@@ -1,5 +1,5 @@
448 drop table if exists t1;
449-set @@max_allowed_packet=20*1024*1024;
450+SET global max_allowed_packet=20*1024*1024;
451 CREATE TABLE t1 (data LONGBLOB) ENGINE=pbxt;
452 INSERT INTO t1 (data) VALUES (NULL);
453 UPDATE t1 set data=repeat('a',18*1024*1024);
454
455=== modified file 'test/mysql-test/r/mysql_client_test.result'
456--- test/mysql-test/r/mysql_client_test.result 2006-10-23 09:14:04 +0000
457+++ test/mysql-test/r/mysql_client_test.result 2009-06-02 18:07:21 +0000
458@@ -1,1 +1,3 @@
459+SET @old_general_log= @@global.general_log;
460 ok
461+SET @@global.general_log= @old_general_log;
462
463=== modified file 'test/mysql-test/r/mysqldump.result'
464--- test/mysql-test/r/mysqldump.result 2009-04-03 19:39:12 +0000
465+++ test/mysql-test/r/mysqldump.result 2009-06-02 18:26:32 +0000
466@@ -29,12 +29,12 @@
467 CREATE TABLE t1 (a decimal(64, 20));
468 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
469 ("0987654321098765432109876543210987654321");
470-SET @saved_cs_client = @@character_set_client;
471-SET character_set_client = utf8;
472+/*!40101 SET @saved_cs_client = @@character_set_client */;
473+/*!40101 SET character_set_client = utf8 */;
474 CREATE TABLE `t1` (
475 `a` decimal(64,20) DEFAULT NULL
476 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
477-SET character_set_client = @saved_cs_client;
478+/*!40101 SET character_set_client = @saved_cs_client */;
479 INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000');
480 DROP TABLE t1;
481 #
482@@ -44,12 +44,12 @@
483 INSERT INTO t1 VALUES ('-9e999999');
484 Warnings:
485 Warning 1264 Out of range value for column 'a' at row 1
486-SET @saved_cs_client = @@character_set_client;
487-SET character_set_client = utf8;
488+/*!40101 SET @saved_cs_client = @@character_set_client */;
489+/*!40101 SET character_set_client = utf8 */;
490 CREATE TABLE `t1` (
491 `a` double DEFAULT NULL
492 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
493-SET character_set_client = @saved_cs_client;
494+/*!40101 SET character_set_client = @saved_cs_client */;
495 INSERT INTO `t1` VALUES (RES);
496 DROP TABLE t1;
497 #
498@@ -65,21 +65,21 @@
499 INSERT INTO t1 VALUES ("1.2345", 2.3456);
500 ERROR 42S22: Unknown column '1.2345' in 'field list'
501 SET SQL_MODE=@OLD_SQL_MODE;
502-SET @saved_cs_client = @@character_set_client;
503-SET character_set_client = utf8;
504+/*!40101 SET @saved_cs_client = @@character_set_client */;
505+/*!40101 SET character_set_client = utf8 */;
506 CREATE TABLE `t1` (
507 `a` decimal(10,5) DEFAULT NULL,
508 `b` float DEFAULT NULL
509 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
510-SET character_set_client = @saved_cs_client;
511+/*!40101 SET character_set_client = @saved_cs_client */;
512 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
513-SET @saved_cs_client = @@character_set_client;
514-SET character_set_client = utf8;
515+/*!40101 SET @saved_cs_client = @@character_set_client */;
516+/*!40101 SET character_set_client = utf8 */;
517 CREATE TABLE `t1` (
518 `a` decimal(10,5) DEFAULT NULL,
519 `b` float DEFAULT NULL
520 );
521-SET character_set_client = @saved_cs_client;
522+/*!40101 SET character_set_client = @saved_cs_client */;
523 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
524
525 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
526@@ -93,13 +93,13 @@
527 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
528 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
529 DROP TABLE IF EXISTS `t1`;
530-SET @saved_cs_client = @@character_set_client;
531-SET character_set_client = utf8;
532+/*!40101 SET @saved_cs_client = @@character_set_client */;
533+/*!40101 SET character_set_client = utf8 */;
534 CREATE TABLE `t1` (
535 `a` decimal(10,5) DEFAULT NULL,
536 `b` float DEFAULT NULL
537 );
538-SET character_set_client = @saved_cs_client;
539+/*!40101 SET character_set_client = @saved_cs_client */;
540
541 LOCK TABLES `t1` WRITE;
542 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
543@@ -122,13 +122,13 @@
544 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
545 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
546 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
547-SET @saved_cs_client = @@character_set_client;
548-SET character_set_client = utf8;
549+/*!40101 SET @saved_cs_client = @@character_set_client */;
550+/*!40101 SET character_set_client = utf8 */;
551 CREATE TABLE `t1` (
552 `a` decimal(10,5) DEFAULT NULL,
553 `b` float DEFAULT NULL
554 );
555-SET character_set_client = @saved_cs_client;
556+/*!40101 SET character_set_client = @saved_cs_client */;
557
558 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
559 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
560@@ -204,12 +204,12 @@
561 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
562 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
563 DROP TABLE IF EXISTS `t1`;
564-SET @saved_cs_client = @@character_set_client;
565-SET character_set_client = utf8;
566+/*!40101 SET @saved_cs_client = @@character_set_client */;
567+/*!40101 SET character_set_client = utf8 */;
568 CREATE TABLE `t1` (
569 `a` varchar(255) DEFAULT NULL
570 ) ENGINE=PBXT DEFAULT CHARSET=koi8r;
571-SET character_set_client = @saved_cs_client;
572+/*!40101 SET character_set_client = @saved_cs_client */;
573
574 LOCK TABLES `t1` WRITE;
575 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
576@@ -240,12 +240,9 @@
577 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL40' */;
578 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
579 DROP TABLE IF EXISTS `t1`;
580-SET @saved_cs_client = @@character_set_client;
581-SET character_set_client = utf8;
582 CREATE TABLE `t1` (
583 `a` int(11) DEFAULT NULL
584 ) TYPE=PBXT;
585-SET character_set_client = @saved_cs_client;
586
587 LOCK TABLES `t1` WRITE;
588 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
589@@ -266,12 +263,9 @@
590 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
591 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
592 DROP TABLE IF EXISTS `t1`;
593-SET @saved_cs_client = @@character_set_client;
594-SET character_set_client = utf8;
595 CREATE TABLE `t1` (
596 `a` int(11) DEFAULT NULL
597 ) TYPE=PBXT;
598-SET character_set_client = @saved_cs_client;
599
600 LOCK TABLES `t1` WRITE;
601 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
602@@ -290,12 +284,12 @@
603 # Bug #2592 'mysqldump doesn't quote "tricky" names correctly'
604 #
605 create table ```a` (i int);
606-SET @saved_cs_client = @@character_set_client;
607-SET character_set_client = utf8;
608+/*!40101 SET @saved_cs_client = @@character_set_client */;
609+/*!40101 SET character_set_client = utf8 */;
610 CREATE TABLE ```a` (
611 `i` int(11) DEFAULT NULL
612 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
613-SET character_set_client = @saved_cs_client;
614+/*!40101 SET character_set_client = @saved_cs_client */;
615 drop table ```a`;
616 #
617 # Bug #2591 "mysqldump quotes names inconsistently"
618@@ -313,12 +307,12 @@
619 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
620 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
621 DROP TABLE IF EXISTS `t1`;
622-SET @saved_cs_client = @@character_set_client;
623-SET character_set_client = utf8;
624+/*!40101 SET @saved_cs_client = @@character_set_client */;
625+/*!40101 SET character_set_client = utf8 */;
626 CREATE TABLE `t1` (
627 `a` int(11) DEFAULT NULL
628 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
629-SET character_set_client = @saved_cs_client;
630+/*!40101 SET character_set_client = @saved_cs_client */;
631
632 LOCK TABLES `t1` WRITE;
633 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
634@@ -341,12 +335,12 @@
635 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
636 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
637 DROP TABLE IF EXISTS "t1";
638-SET @saved_cs_client = @@character_set_client;
639-SET character_set_client = utf8;
640+/*!40101 SET @saved_cs_client = @@character_set_client */;
641+/*!40101 SET character_set_client = utf8 */;
642 CREATE TABLE "t1" (
643 "a" int(11) DEFAULT NULL
644 );
645-SET character_set_client = @saved_cs_client;
646+/*!40101 SET character_set_client = @saved_cs_client */;
647
648 LOCK TABLES "t1" WRITE;
649 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
650@@ -372,12 +366,12 @@
651 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
652 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
653 DROP TABLE IF EXISTS `t1`;
654-SET @saved_cs_client = @@character_set_client;
655-SET character_set_client = utf8;
656+/*!40101 SET @saved_cs_client = @@character_set_client */;
657+/*!40101 SET character_set_client = utf8 */;
658 CREATE TABLE `t1` (
659 `a` int(11) DEFAULT NULL
660 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
661-SET character_set_client = @saved_cs_client;
662+/*!40101 SET character_set_client = @saved_cs_client */;
663
664 LOCK TABLES `t1` WRITE;
665 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
666@@ -400,12 +394,12 @@
667 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
668 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
669 DROP TABLE IF EXISTS "t1";
670-SET @saved_cs_client = @@character_set_client;
671-SET character_set_client = utf8;
672+/*!40101 SET @saved_cs_client = @@character_set_client */;
673+/*!40101 SET character_set_client = utf8 */;
674 CREATE TABLE "t1" (
675 "a" int(11) DEFAULT NULL
676 );
677-SET character_set_client = @saved_cs_client;
678+/*!40101 SET character_set_client = @saved_cs_client */;
679
680 LOCK TABLES "t1" WRITE;
681 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
682@@ -435,12 +429,12 @@
683 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */;
684 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
685 DROP TABLE IF EXISTS `t1`;
686-SET @saved_cs_client = @@character_set_client;
687-SET character_set_client = utf8;
688+/*!40101 SET @saved_cs_client = @@character_set_client */;
689+/*!40101 SET character_set_client = utf8 */;
690 CREATE TABLE `t1` (
691 `a` int(11) DEFAULT NULL
692 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
693-SET character_set_client = @saved_cs_client;
694+/*!40101 SET character_set_client = @saved_cs_client */;
695
696 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
697
698@@ -529,12 +523,12 @@
699 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
700 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
701 DROP TABLE IF EXISTS `t1`;
702-SET @saved_cs_client = @@character_set_client;
703-SET character_set_client = utf8;
704+/*!40101 SET @saved_cs_client = @@character_set_client */;
705+/*!40101 SET character_set_client = utf8 */;
706 CREATE TABLE `t1` (
707 `a` char(10) DEFAULT NULL
708 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
709-SET character_set_client = @saved_cs_client;
710+/*!40101 SET character_set_client = @saved_cs_client */;
711
712 LOCK TABLES `t1` WRITE;
713 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
714@@ -565,64 +559,55 @@
715 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
716 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
717 DROP TABLE IF EXISTS `t1`;
718-SET @saved_cs_client = @@character_set_client;
719-SET character_set_client = utf8;
720-CREATE TABLE `t1` (
721- `a` char(10) DEFAULT NULL
722-) TYPE=PBXT;
723-SET character_set_client = @saved_cs_client;
724-
725-LOCK TABLES `t1` WRITE;
726-/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
727-INSERT INTO `t1` VALUES ('Ž™šá');
728-/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
729-UNLOCK TABLES;
730-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
731-
732-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
733-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
734-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
735-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
736-
737-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
738-/*!40103 SET TIME_ZONE='+00:00' */;
739-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
740-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
741-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
742-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
743-DROP TABLE IF EXISTS `t1`;
744-SET @saved_cs_client = @@character_set_client;
745-SET character_set_client = utf8;
746-CREATE TABLE `t1` (
747- `a` char(10) DEFAULT NULL
748-) TYPE=PBXT;
749-SET character_set_client = @saved_cs_client;
750-
751-LOCK TABLES `t1` WRITE;
752-/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
753-INSERT INTO `t1` VALUES ('Ž™šá');
754-/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
755-UNLOCK TABLES;
756-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
757-
758-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
759-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
760-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
761-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
762-
763-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
764-/*!40103 SET TIME_ZONE='+00:00' */;
765-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
766-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
767-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
768-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
769-DROP TABLE IF EXISTS `t1`;
770-SET @saved_cs_client = @@character_set_client;
771-SET character_set_client = utf8;
772-CREATE TABLE `t1` (
773- `a` char(10) DEFAULT NULL
774-) TYPE=PBXT;
775-SET character_set_client = @saved_cs_client;
776+CREATE TABLE `t1` (
777+ `a` char(10) DEFAULT NULL
778+) TYPE=PBXT;
779+
780+LOCK TABLES `t1` WRITE;
781+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
782+INSERT INTO `t1` VALUES ('Ž™šá');
783+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
784+UNLOCK TABLES;
785+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
786+
787+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
788+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
789+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
790+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
791+
792+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
793+/*!40103 SET TIME_ZONE='+00:00' */;
794+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
795+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
796+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
797+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
798+DROP TABLE IF EXISTS `t1`;
799+CREATE TABLE `t1` (
800+ `a` char(10) DEFAULT NULL
801+) TYPE=PBXT;
802+
803+LOCK TABLES `t1` WRITE;
804+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
805+INSERT INTO `t1` VALUES ('Ž™šá');
806+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
807+UNLOCK TABLES;
808+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
809+
810+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
811+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
812+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
813+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
814+
815+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
816+/*!40103 SET TIME_ZONE='+00:00' */;
817+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
818+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
819+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
820+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
821+DROP TABLE IF EXISTS `t1`;
822+CREATE TABLE `t1` (
823+ `a` char(10) DEFAULT NULL
824+) TYPE=PBXT;
825
826 LOCK TABLES `t1` WRITE;
827 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
828@@ -656,12 +641,12 @@
829 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
830 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
831 DROP TABLE IF EXISTS `t2`;
832-SET @saved_cs_client = @@character_set_client;
833-SET character_set_client = utf8;
834+/*!40101 SET @saved_cs_client = @@character_set_client */;
835+/*!40101 SET character_set_client = utf8 */;
836 CREATE TABLE `t2` (
837 `a` int(11) DEFAULT NULL
838 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
839-SET character_set_client = @saved_cs_client;
840+/*!40101 SET character_set_client = @saved_cs_client */;
841
842 LOCK TABLES `t2` WRITE;
843 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
844@@ -697,12 +682,12 @@
845 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
846 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
847 DROP TABLE IF EXISTS `t1`;
848-SET @saved_cs_client = @@character_set_client;
849-SET character_set_client = utf8;
850+/*!40101 SET @saved_cs_client = @@character_set_client */;
851+/*!40101 SET character_set_client = utf8 */;
852 CREATE TABLE `t1` (
853 `b` blob
854 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
855-SET character_set_client = @saved_cs_client;
856+/*!40101 SET character_set_client = @saved_cs_client */;
857
858 LOCK TABLES `t1` WRITE;
859 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
860@@ -738,12 +723,12 @@
861 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
862 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
863 DROP TABLE IF EXISTS `t1`;
864-SET @saved_cs_client = @@character_set_client;
865-SET character_set_client = utf8;
866+/*!40101 SET @saved_cs_client = @@character_set_client */;
867+/*!40101 SET character_set_client = utf8 */;
868 CREATE TABLE `t1` (
869 `a` int(11) DEFAULT NULL
870 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
871-SET character_set_client = @saved_cs_client;
872+/*!40101 SET character_set_client = @saved_cs_client */;
873
874 LOCK TABLES `t1` WRITE;
875 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
876@@ -772,12 +757,12 @@
877 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
878 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
879 DROP TABLE IF EXISTS `t1`;
880-SET @saved_cs_client = @@character_set_client;
881-SET character_set_client = utf8;
882+/*!40101 SET @saved_cs_client = @@character_set_client */;
883+/*!40101 SET character_set_client = utf8 */;
884 CREATE TABLE `t1` (
885 `a` int(11) DEFAULT NULL
886 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
887-SET character_set_client = @saved_cs_client;
888+/*!40101 SET character_set_client = @saved_cs_client */;
889
890 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
891 INSERT IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
892@@ -1141,8 +1126,8 @@
893 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
894 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
895 DROP TABLE IF EXISTS `t1`;
896-SET @saved_cs_client = @@character_set_client;
897-SET character_set_client = utf8;
898+/*!40101 SET @saved_cs_client = @@character_set_client */;
899+/*!40101 SET character_set_client = utf8 */;
900 CREATE TABLE `t1` (
901 `F_c4ca4238a0b923820dcc509a6f75849b` int(11) DEFAULT NULL,
902 `F_c81e728d9d4c2f636f067f89cc14862c` int(11) DEFAULT NULL,
903@@ -1475,7 +1460,7 @@
904 `F_6faa8040da20ef399b63a72d0e4ab575` int(11) DEFAULT NULL,
905 `F_fe73f687e5bc5280214e0486b273a5f9` int(11) DEFAULT NULL
906 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
907-SET character_set_client = @saved_cs_client;
908+/*!40101 SET character_set_client = @saved_cs_client */;
909
910 LOCK TABLES `t1` WRITE;
911 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
912@@ -1516,12 +1501,12 @@
913
914 USE `test`;
915 DROP TABLE IF EXISTS `t1`;
916-SET @saved_cs_client = @@character_set_client;
917-SET character_set_client = utf8;
918+/*!40101 SET @saved_cs_client = @@character_set_client */;
919+/*!40101 SET character_set_client = utf8 */;
920 CREATE TABLE `t1` (
921 `a` int(11) DEFAULT NULL
922 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
923-SET character_set_client = @saved_cs_client;
924+/*!40101 SET character_set_client = @saved_cs_client */;
925
926 LOCK TABLES `t1` WRITE;
927 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
928@@ -1560,19 +1545,19 @@
929 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
930 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
931 DROP TABLE IF EXISTS `t1`;
932-SET @saved_cs_client = @@character_set_client;
933-SET character_set_client = utf8;
934+/*!40101 SET @saved_cs_client = @@character_set_client */;
935+/*!40101 SET character_set_client = utf8 */;
936 CREATE TABLE `t1` (
937 `a` int(11) DEFAULT NULL
938 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
939-SET character_set_client = @saved_cs_client;
940+/*!40101 SET character_set_client = @saved_cs_client */;
941 DROP TABLE IF EXISTS `t2`;
942-SET @saved_cs_client = @@character_set_client;
943-SET character_set_client = utf8;
944+/*!40101 SET @saved_cs_client = @@character_set_client */;
945+/*!40101 SET character_set_client = utf8 */;
946 CREATE TABLE `t2` (
947 `a` int(11) DEFAULT NULL
948 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
949-SET character_set_client = @saved_cs_client;
950+/*!40101 SET character_set_client = @saved_cs_client */;
951 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
952
953 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
954@@ -1595,19 +1580,19 @@
955 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
956 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
957 DROP TABLE IF EXISTS `t1`;
958-SET @saved_cs_client = @@character_set_client;
959-SET character_set_client = utf8;
960+/*!40101 SET @saved_cs_client = @@character_set_client */;
961+/*!40101 SET character_set_client = utf8 */;
962 CREATE TABLE `t1` (
963 `a` int(11) DEFAULT NULL
964 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
965-SET character_set_client = @saved_cs_client;
966+/*!40101 SET character_set_client = @saved_cs_client */;
967 DROP TABLE IF EXISTS `t2`;
968-SET @saved_cs_client = @@character_set_client;
969-SET character_set_client = utf8;
970+/*!40101 SET @saved_cs_client = @@character_set_client */;
971+/*!40101 SET character_set_client = utf8 */;
972 CREATE TABLE `t2` (
973 `a` int(11) DEFAULT NULL
974 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
975-SET character_set_client = @saved_cs_client;
976+/*!40101 SET character_set_client = @saved_cs_client */;
977 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
978
979 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
980@@ -1807,26 +1792,26 @@
981 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
982 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
983 DROP TABLE IF EXISTS `t3`;
984-SET @saved_cs_client = @@character_set_client;
985-SET character_set_client = utf8;
986+/*!40101 SET @saved_cs_client = @@character_set_client */;
987+/*!40101 SET character_set_client = utf8 */;
988 CREATE TABLE `t3` (
989 `a` int(11) DEFAULT NULL
990 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
991-SET character_set_client = @saved_cs_client;
992+/*!40101 SET character_set_client = @saved_cs_client */;
993 DROP TABLE IF EXISTS `t1`;
994-SET @saved_cs_client = @@character_set_client;
995-SET character_set_client = utf8;
996+/*!40101 SET @saved_cs_client = @@character_set_client */;
997+/*!40101 SET character_set_client = utf8 */;
998 CREATE TABLE `t1` (
999 `a` int(11) DEFAULT NULL
1000 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1001-SET character_set_client = @saved_cs_client;
1002+/*!40101 SET character_set_client = @saved_cs_client */;
1003 DROP TABLE IF EXISTS `t2`;
1004-SET @saved_cs_client = @@character_set_client;
1005-SET character_set_client = utf8;
1006+/*!40101 SET @saved_cs_client = @@character_set_client */;
1007+/*!40101 SET character_set_client = utf8 */;
1008 CREATE TABLE `t2` (
1009 `a` int(11) DEFAULT NULL
1010 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1011-SET character_set_client = @saved_cs_client;
1012+/*!40101 SET character_set_client = @saved_cs_client */;
1013 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
1014
1015 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
1016@@ -1856,12 +1841,12 @@
1017 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1018 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1019 DROP TABLE IF EXISTS `t1`;
1020-SET @saved_cs_client = @@character_set_client;
1021-SET character_set_client = utf8;
1022+/*!40101 SET @saved_cs_client = @@character_set_client */;
1023+/*!40101 SET character_set_client = utf8 */;
1024 CREATE TABLE `t1` (
1025 `a` int(11) DEFAULT NULL
1026 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1027-SET character_set_client = @saved_cs_client;
1028+/*!40101 SET character_set_client = @saved_cs_client */;
1029
1030 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
1031
1032@@ -1892,15 +1877,15 @@
1033 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
1034 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1035 DROP TABLE IF EXISTS "t1";
1036-SET @saved_cs_client = @@character_set_client;
1037-SET character_set_client = utf8;
1038+/*!40101 SET @saved_cs_client = @@character_set_client */;
1039+/*!40101 SET character_set_client = utf8 */;
1040 CREATE TABLE "t1" (
1041 "a b" int(11) NOT NULL DEFAULT '0',
1042 "c""d" int(11) NOT NULL DEFAULT '0',
1043 "e`f" int(11) NOT NULL DEFAULT '0',
1044 PRIMARY KEY ("a b","c""d","e`f")
1045 );
1046-SET character_set_client = @saved_cs_client;
1047+/*!40101 SET character_set_client = @saved_cs_client */;
1048
1049 LOCK TABLES "t1" WRITE;
1050 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
1051@@ -1926,15 +1911,15 @@
1052 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1053 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1054 DROP TABLE IF EXISTS `t1`;
1055-SET @saved_cs_client = @@character_set_client;
1056-SET character_set_client = utf8;
1057+/*!40101 SET @saved_cs_client = @@character_set_client */;
1058+/*!40101 SET character_set_client = utf8 */;
1059 CREATE TABLE `t1` (
1060 `a b` int(11) NOT NULL DEFAULT '0',
1061 `c"d` int(11) NOT NULL DEFAULT '0',
1062 `e``f` int(11) NOT NULL DEFAULT '0',
1063 PRIMARY KEY (`a b`,`c"d`,`e``f`)
1064 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1065-SET character_set_client = @saved_cs_client;
1066+/*!40101 SET character_set_client = @saved_cs_client */;
1067
1068 LOCK TABLES `t1` WRITE;
1069 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1070@@ -1980,13 +1965,13 @@
1071 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1072 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1073 DROP TABLE IF EXISTS `t2`;
1074-SET @saved_cs_client = @@character_set_client;
1075-SET character_set_client = utf8;
1076+/*!40101 SET @saved_cs_client = @@character_set_client */;
1077+/*!40101 SET character_set_client = utf8 */;
1078 CREATE TABLE `t2` (
1079 `a` varchar(30) DEFAULT NULL,
1080 KEY `a` (`a`(5))
1081 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1082-SET character_set_client = @saved_cs_client;
1083+/*!40101 SET character_set_client = @saved_cs_client */;
1084
1085 LOCK TABLES `t2` WRITE;
1086 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
1087@@ -2079,12 +2064,12 @@
1088 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1089 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1090 DROP TABLE IF EXISTS `t1`;
1091-SET @saved_cs_client = @@character_set_client;
1092-SET character_set_client = utf8;
1093+/*!40101 SET @saved_cs_client = @@character_set_client */;
1094+/*!40101 SET character_set_client = utf8 */;
1095 CREATE TABLE `t1` (
1096 `a` int(11) DEFAULT NULL
1097 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1098-SET character_set_client = @saved_cs_client;
1099+/*!40101 SET character_set_client = @saved_cs_client */;
1100
1101 LOCK TABLES `t1` WRITE;
1102 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1103@@ -2151,13 +2136,13 @@
1104 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1105 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1106 DROP TABLE IF EXISTS `t2`;
1107-SET @saved_cs_client = @@character_set_client;
1108-SET character_set_client = utf8;
1109+/*!40101 SET @saved_cs_client = @@character_set_client */;
1110+/*!40101 SET character_set_client = utf8 */;
1111 CREATE TABLE `t2` (
1112 `a` varchar(30) DEFAULT NULL,
1113 KEY `a` (`a`(5))
1114 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1115-SET character_set_client = @saved_cs_client;
1116+/*!40101 SET character_set_client = @saved_cs_client */;
1117
1118 LOCK TABLES `t2` WRITE;
1119 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
1120@@ -2218,12 +2203,12 @@
1121 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1122 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1123 DROP TABLE IF EXISTS `t1`;
1124-SET @saved_cs_client = @@character_set_client;
1125-SET character_set_client = utf8;
1126+/*!40101 SET @saved_cs_client = @@character_set_client */;
1127+/*!40101 SET character_set_client = utf8 */;
1128 CREATE TABLE `t1` (
1129 `a` char(10) DEFAULT NULL
1130 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1131-SET character_set_client = @saved_cs_client;
1132+/*!40101 SET character_set_client = @saved_cs_client */;
1133
1134 LOCK TABLES `t1` WRITE;
1135 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1136@@ -2264,14 +2249,14 @@
1137 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1138 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1139 DROP TABLE IF EXISTS `t1`;
1140-SET @saved_cs_client = @@character_set_client;
1141-SET character_set_client = utf8;
1142+/*!40101 SET @saved_cs_client = @@character_set_client */;
1143+/*!40101 SET character_set_client = utf8 */;
1144 CREATE TABLE `t1` (
1145 `a` int(11) DEFAULT NULL,
1146 `b` int(11) DEFAULT NULL,
1147 `c` varchar(30) DEFAULT NULL
1148 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1149-SET character_set_client = @saved_cs_client;
1150+/*!40101 SET character_set_client = @saved_cs_client */;
1151
1152 LOCK TABLES `t1` WRITE;
1153 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1154@@ -2423,13 +2408,13 @@
1155
1156 USE `test`;
1157 DROP TABLE IF EXISTS `t1`;
1158-SET @saved_cs_client = @@character_set_client;
1159-SET character_set_client = utf8;
1160+/*!40101 SET @saved_cs_client = @@character_set_client */;
1161+/*!40101 SET character_set_client = utf8 */;
1162 CREATE TABLE `t1` (
1163 `a` int(11) DEFAULT NULL,
1164 `b` bigint(20) DEFAULT NULL
1165 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1166-SET character_set_client = @saved_cs_client;
1167+/*!40101 SET character_set_client = @saved_cs_client */;
1168
1169 LOCK TABLES `t1` WRITE;
1170 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1171@@ -2495,12 +2480,12 @@
1172 /*!50003 SET character_set_results = @saved_cs_results */ ;
1173 /*!50003 SET collation_connection = @saved_col_connection */ ;
1174 DROP TABLE IF EXISTS `t2`;
1175-SET @saved_cs_client = @@character_set_client;
1176-SET character_set_client = utf8;
1177+/*!40101 SET @saved_cs_client = @@character_set_client */;
1178+/*!40101 SET character_set_client = utf8 */;
1179 CREATE TABLE `t2` (
1180 `a` int(11) DEFAULT NULL
1181 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1182-SET character_set_client = @saved_cs_client;
1183+/*!40101 SET character_set_client = @saved_cs_client */;
1184
1185 LOCK TABLES `t2` WRITE;
1186 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
1187@@ -2552,13 +2537,13 @@
1188
1189 USE `test`;
1190 DROP TABLE IF EXISTS `t1`;
1191-SET @saved_cs_client = @@character_set_client;
1192-SET character_set_client = utf8;
1193+/*!40101 SET @saved_cs_client = @@character_set_client */;
1194+/*!40101 SET character_set_client = utf8 */;
1195 CREATE TABLE `t1` (
1196 `a` int(11) DEFAULT NULL,
1197 `b` bigint(20) DEFAULT NULL
1198 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1199-SET character_set_client = @saved_cs_client;
1200+/*!40101 SET character_set_client = @saved_cs_client */;
1201
1202 LOCK TABLES `t1` WRITE;
1203 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1204@@ -2566,12 +2551,12 @@
1205 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
1206 UNLOCK TABLES;
1207 DROP TABLE IF EXISTS `t2`;
1208-SET @saved_cs_client = @@character_set_client;
1209-SET character_set_client = utf8;
1210+/*!40101 SET @saved_cs_client = @@character_set_client */;
1211+/*!40101 SET character_set_client = utf8 */;
1212 CREATE TABLE `t2` (
1213 `a` int(11) DEFAULT NULL
1214 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1215-SET character_set_client = @saved_cs_client;
1216+/*!40101 SET character_set_client = @saved_cs_client */;
1217
1218 LOCK TABLES `t2` WRITE;
1219 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
1220@@ -2695,12 +2680,12 @@
1221
1222 USE `test`;
1223 DROP TABLE IF EXISTS `t1`;
1224-SET @saved_cs_client = @@character_set_client;
1225-SET character_set_client = utf8;
1226+/*!40101 SET @saved_cs_client = @@character_set_client */;
1227+/*!40101 SET character_set_client = utf8 */;
1228 CREATE TABLE `t1` (
1229 `id` int(11) DEFAULT NULL
1230 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1231-SET character_set_client = @saved_cs_client;
1232+/*!40101 SET character_set_client = @saved_cs_client */;
1233
1234 LOCK TABLES `t1` WRITE;
1235 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1236@@ -2846,13 +2831,13 @@
1237
1238 USE `test`;
1239 DROP TABLE IF EXISTS `t1`;
1240-SET @saved_cs_client = @@character_set_client;
1241-SET character_set_client = utf8;
1242+/*!40101 SET @saved_cs_client = @@character_set_client */;
1243+/*!40101 SET character_set_client = utf8 */;
1244 CREATE TABLE `t1` (
1245 `d` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
1246 UNIQUE KEY `d` (`d`)
1247 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1248-SET character_set_client = @saved_cs_client;
1249+/*!40101 SET character_set_client = @saved_cs_client */;
1250
1251 LOCK TABLES `t1` WRITE;
1252 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1253@@ -2883,13 +2868,13 @@
1254
1255 USE `test`;
1256 DROP TABLE IF EXISTS `t1`;
1257-SET @saved_cs_client = @@character_set_client;
1258-SET character_set_client = utf8;
1259+/*!40101 SET @saved_cs_client = @@character_set_client */;
1260+/*!40101 SET character_set_client = utf8 */;
1261 CREATE TABLE `t1` (
1262 `d` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
1263 UNIQUE KEY `d` (`d`)
1264 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1265-SET character_set_client = @saved_cs_client;
1266+/*!40101 SET character_set_client = @saved_cs_client */;
1267
1268 LOCK TABLES `t1` WRITE;
1269 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1270@@ -2936,12 +2921,12 @@
1271 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
1272 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1273 DROP TABLE IF EXISTS "t1 test";
1274-SET @saved_cs_client = @@character_set_client;
1275-SET character_set_client = utf8;
1276+/*!40101 SET @saved_cs_client = @@character_set_client */;
1277+/*!40101 SET character_set_client = utf8 */;
1278 CREATE TABLE "t1 test" (
1279 "a1" int(11) DEFAULT NULL
1280 );
1281-SET character_set_client = @saved_cs_client;
1282+/*!40101 SET character_set_client = @saved_cs_client */;
1283
1284 LOCK TABLES "t1 test" WRITE;
1285 /*!40000 ALTER TABLE "t1 test" DISABLE KEYS */;
1286@@ -2965,12 +2950,12 @@
1287 /*!50003 SET character_set_results = @saved_cs_results */ ;
1288 /*!50003 SET collation_connection = @saved_col_connection */ ;
1289 DROP TABLE IF EXISTS "t2 test";
1290-SET @saved_cs_client = @@character_set_client;
1291-SET character_set_client = utf8;
1292+/*!40101 SET @saved_cs_client = @@character_set_client */;
1293+/*!40101 SET character_set_client = utf8 */;
1294 CREATE TABLE "t2 test" (
1295 "a2" int(11) DEFAULT NULL
1296 );
1297-SET character_set_client = @saved_cs_client;
1298+/*!40101 SET character_set_client = @saved_cs_client */;
1299
1300 LOCK TABLES "t2 test" WRITE;
1301 /*!40000 ALTER TABLE "t2 test" DISABLE KEYS */;
1302@@ -3019,14 +3004,14 @@
1303
1304 USE `test`;
1305 DROP TABLE IF EXISTS `t1`;
1306-SET @saved_cs_client = @@character_set_client;
1307-SET character_set_client = utf8;
1308+/*!40101 SET @saved_cs_client = @@character_set_client */;
1309+/*!40101 SET character_set_client = utf8 */;
1310 CREATE TABLE `t1` (
1311 `a` int(11) DEFAULT NULL,
1312 `b` varchar(32) DEFAULT NULL,
1313 `c` varchar(32) DEFAULT NULL
1314 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1315-SET character_set_client = @saved_cs_client;
1316+/*!40101 SET character_set_client = @saved_cs_client */;
1317
1318 LOCK TABLES `t1` WRITE;
1319 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1320@@ -3150,12 +3135,12 @@
1321
1322 USE `test`;
1323 DROP TABLE IF EXISTS `t1`;
1324-SET @saved_cs_client = @@character_set_client;
1325-SET character_set_client = utf8;
1326+/*!40101 SET @saved_cs_client = @@character_set_client */;
1327+/*!40101 SET character_set_client = utf8 */;
1328 CREATE TABLE `t1` (
1329 `a` int(11) DEFAULT NULL
1330 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1331-SET character_set_client = @saved_cs_client;
1332+/*!40101 SET character_set_client = @saved_cs_client */;
1333
1334 LOCK TABLES `t1` WRITE;
1335 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1336@@ -3209,13 +3194,13 @@
1337 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1338 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1339 DROP TABLE IF EXISTS `t1`;
1340-SET @saved_cs_client = @@character_set_client;
1341-SET character_set_client = utf8;
1342+/*!40101 SET @saved_cs_client = @@character_set_client */;
1343+/*!40101 SET character_set_client = utf8 */;
1344 CREATE TABLE `t1` (
1345 `a` binary(1) DEFAULT NULL,
1346 `b` blob
1347 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1348-SET character_set_client = @saved_cs_client;
1349+/*!40101 SET character_set_client = @saved_cs_client */;
1350
1351 LOCK TABLES `t1` WRITE;
1352 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1353@@ -3244,13 +3229,13 @@
1354 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1355 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1356 DROP TABLE IF EXISTS `t1`;
1357-SET @saved_cs_client = @@character_set_client;
1358-SET character_set_client = utf8;
1359+/*!40101 SET @saved_cs_client = @@character_set_client */;
1360+/*!40101 SET character_set_client = utf8 */;
1361 CREATE TABLE `t1` (
1362 `a` binary(1) DEFAULT NULL,
1363 `b` blob
1364 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1365-SET character_set_client = @saved_cs_client;
1366+/*!40101 SET character_set_client = @saved_cs_client */;
1367
1368 LOCK TABLES `t1` WRITE;
1369 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1370@@ -3423,12 +3408,12 @@
1371
1372 USE `mysqldump_test_db`;
1373 DROP TABLE IF EXISTS `t1`;
1374-SET @saved_cs_client = @@character_set_client;
1375-SET character_set_client = utf8;
1376+/*!40101 SET @saved_cs_client = @@character_set_client */;
1377+/*!40101 SET character_set_client = utf8 */;
1378 CREATE TABLE `t1` (
1379 `id` int(11) DEFAULT NULL
1380 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1381-SET character_set_client = @saved_cs_client;
1382+/*!40101 SET character_set_client = @saved_cs_client */;
1383
1384 LOCK TABLES `t1` WRITE;
1385 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1386@@ -3485,14 +3470,14 @@
1387 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 */;
1388
1389 USE `mysqldump_tables`;
1390-SET @saved_cs_client = @@character_set_client;
1391-SET character_set_client = utf8;
1392+/*!40101 SET @saved_cs_client = @@character_set_client */;
1393+/*!40101 SET character_set_client = utf8 */;
1394 CREATE TABLE `basetable` (
1395 `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
1396 `tag` varchar(64) DEFAULT NULL,
1397 UNIQUE KEY `id` (`id`)
1398 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1399-SET character_set_client = @saved_cs_client;
1400+/*!40101 SET character_set_client = @saved_cs_client */;
1401
1402 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_views` /*!40100 DEFAULT CHARACTER SET latin1 */;
1403
1404@@ -3516,7 +3501,7 @@
1405 /*!50001 SET collation_connection = latin1_swedish_ci */;
1406 /*!50001 CREATE ALGORITHM=UNDEFINED */
1407 /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
1408-/*!50001 VIEW `mysqldump_views`.`nasishnasifu` AS select `mysqldump_tables`.`basetable`.`id` AS `id` from `mysqldump_tables`.`basetable` */;
1409+/*!50001 VIEW `nasishnasifu` AS select `mysqldump_tables`.`basetable`.`id` AS `id` from `mysqldump_tables`.`basetable` */;
1410 /*!50001 SET character_set_client = @saved_cs_client */;
1411 /*!50001 SET character_set_results = @saved_cs_results */;
1412 /*!50001 SET collation_connection = @saved_col_connection */;
1413@@ -3659,31 +3644,31 @@
1414 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1415 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1416 DROP TABLE IF EXISTS `t1`;
1417-SET @saved_cs_client = @@character_set_client;
1418-SET character_set_client = utf8;
1419+/*!40101 SET @saved_cs_client = @@character_set_client */;
1420+/*!40101 SET character_set_client = utf8 */;
1421 CREATE TABLE `t1` (
1422 `a` int(11) DEFAULT NULL
1423 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t2`,`t3`);
1424-SET character_set_client = @saved_cs_client;
1425+/*!40101 SET character_set_client = @saved_cs_client */;
1426 DROP TABLE IF EXISTS `t2`;
1427-SET @saved_cs_client = @@character_set_client;
1428-SET character_set_client = utf8;
1429+/*!40101 SET @saved_cs_client = @@character_set_client */;
1430+/*!40101 SET character_set_client = utf8 */;
1431 CREATE TABLE `t2` (
1432 `a` int(11) DEFAULT NULL
1433 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
1434-SET character_set_client = @saved_cs_client;
1435+/*!40101 SET character_set_client = @saved_cs_client */;
1436
1437 LOCK TABLES `t2` WRITE;
1438 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
1439 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
1440 UNLOCK TABLES;
1441 DROP TABLE IF EXISTS `t3`;
1442-SET @saved_cs_client = @@character_set_client;
1443-SET character_set_client = utf8;
1444+/*!40101 SET @saved_cs_client = @@character_set_client */;
1445+/*!40101 SET character_set_client = utf8 */;
1446 CREATE TABLE `t3` (
1447 `a` int(11) DEFAULT NULL
1448 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
1449-SET character_set_client = @saved_cs_client;
1450+/*!40101 SET character_set_client = @saved_cs_client */;
1451
1452 LOCK TABLES `t3` WRITE;
1453 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
1454@@ -3763,13 +3748,13 @@
1455 #
1456 CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
1457 INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
1458-SET @saved_cs_client = @@character_set_client;
1459-SET character_set_client = utf8;
1460+/*!40101 SET @saved_cs_client = @@character_set_client */;
1461+/*!40101 SET character_set_client = utf8 */;
1462 CREATE TABLE `t1` (
1463 `c1` int(11) DEFAULT NULL,
1464 `c2` longblob
1465 );
1466-SET character_set_client = @saved_cs_client;
1467+/*!40101 SET character_set_client = @saved_cs_client */;
1468 INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171);
1469 DROP TABLE t1;
1470 #
1471@@ -3846,13 +3831,13 @@
1472 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
1473 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1474 DROP TABLE IF EXISTS `t1`;
1475-SET @saved_cs_client = @@character_set_client;
1476-SET character_set_client = utf8;
1477+/*!40101 SET @saved_cs_client = @@character_set_client */;
1478+/*!40101 SET character_set_client = utf8 */;
1479 CREATE TABLE `t1` (
1480 `a` int(11) DEFAULT NULL,
1481 `b` int(11) DEFAULT NULL
1482 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1483-SET character_set_client = @saved_cs_client;
1484+/*!40101 SET character_set_client = @saved_cs_client */;
1485
1486 LOCK TABLES `t1` WRITE;
1487 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1488@@ -3941,12 +3926,12 @@
1489
1490 USE `mysqldump_test_db`;
1491 DROP TABLE IF EXISTS `t1`;
1492-SET @saved_cs_client = @@character_set_client;
1493-SET character_set_client = utf8;
1494+/*!40101 SET @saved_cs_client = @@character_set_client */;
1495+/*!40101 SET character_set_client = utf8 */;
1496 CREATE TABLE `t1` (
1497 `id` int(11) DEFAULT NULL
1498 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1499-SET character_set_client = @saved_cs_client;
1500+/*!40101 SET character_set_client = @saved_cs_client */;
1501
1502 LOCK TABLES `t1` WRITE;
1503 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
1504@@ -4046,12 +4031,12 @@
1505 use `test-database`;
1506 create table test (a int);
1507 DROP TABLE IF EXISTS `test`;
1508-SET @saved_cs_client = @@character_set_client;
1509-SET character_set_client = utf8;
1510+/*!40101 SET @saved_cs_client = @@character_set_client */;
1511+/*!40101 SET character_set_client = utf8 */;
1512 CREATE TABLE `test` (
1513 `a` int(11) DEFAULT NULL
1514 ) ENGINE=PBXT DEFAULT CHARSET=latin1;
1515-SET character_set_client = @saved_cs_client;
1516+/*!40101 SET character_set_client = @saved_cs_client */;
1517 LOCK TABLES `test` WRITE;
1518 /*!40000 ALTER TABLE `test` DISABLE KEYS */;
1519 /*!40000 ALTER TABLE `test` ENABLE KEYS */;
1520
1521=== modified file 'test/mysql-test/r/mysqltest.result'
1522--- test/mysql-test/r/mysqltest.result 2008-06-09 12:49:32 +0000
1523+++ test/mysql-test/r/mysqltest.result 2009-06-02 18:38:30 +0000
1524@@ -14,6 +14,7 @@
1525 otto
1526 1
1527 mysqltest: At line 1: query 'select otto from (select 1 as otto) as t1' succeeded - should have failed with sqlstate 42S22...
1528+mysqltest: At line 1: expecting a SQL-state (00000) from query 'remove_file MYSQLTEST_VARDIR/tmp/test_nonexistent.tmp' which cannot produce one...
1529 select friedrich from (select 1 as otto) as t1;
1530 ERROR 42S22: Unknown column 'friedrich' in 'field list'
1531 mysqltest: At line 1: query 'select friedrich from (select 1 as otto) as t1' failed with wrong sqlstate 42S22: 'Unknown column 'friedrich' in 'field list'', instead of 00000...
1532@@ -152,8 +153,12 @@
1533 mysqltest: At line 1: End of line junk detected: "sleep 7
1534 # Another comment
1535 "
1536-mysqltest: At line 1: Missing delimiter
1537-mysqltest: At line 1: Missing delimiter
1538+mysqltest: At line 1: Extra argument 'comment
1539+# comment 3
1540+disable_query_log' passed to 'disconnect'
1541+mysqltest: At line 1: Extra argument 'comment
1542+# comment 3
1543+disable_query_log' passed to 'disconnect'
1544 mysqltest: At line 1: End of line junk detected: "disconnect default
1545
1546 #
1547@@ -210,7 +215,6 @@
1548 "MySQL: The world's most popular ;open source database"
1549 echo message echo message
1550
1551-mysqltest: At line 1: command "false" failed
1552 mysqltest: At line 1: Missing argument in exec
1553 MySQL
1554 "MySQL"
1555@@ -293,7 +297,7 @@
1556 failing query in let
1557 mysqltest: At line 1: Error running query 'failing query': 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 'failing query' at line 1
1558 mysqltest: At line 1: Missing required argument 'filename' to command 'source'
1559-mysqltest: At line 1: Could not open './non_existingFile' for reading
1560+mysqltest: At line 1: Could not open './non_existingFile' for reading, errno: 2
1561 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep
1562 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 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 'garbage' at line 1
1563
1564@@ -378,7 +382,6 @@
1565 mysqltest: At line 1: End of line junk detected: "1000"
1566 mysqltest: At line 1: Missing arguments to system, nothing to do!
1567 mysqltest: At line 1: Missing arguments to system, nothing to do!
1568-mysqltest: At line 1: system command 'false' failed
1569 system command 'NonExistsinfComamdn 2> /dev/null' failed
1570 test
1571 test2
1572@@ -443,7 +446,7 @@
1573 Output from mysqltest-x.inc
1574 Output from mysqltest-x.inc
1575 Output from mysqltest-x.inc
1576-mysqltest: Could not open './non_existing_file.inc' for reading: errno = 2
1577+mysqltest: Could not open './non_existing_file.inc' for reading, errno: 2
1578 failing_statement;
1579 ERROR 42000: 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 'failing_statement' at line 1
1580 failing_statement;
1581@@ -486,8 +489,6 @@
1582 insert into t1 values (1);
1583 select 'select-me';
1584 insertz 'error query'' failed: 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 'insertz 'error query'' at line 1
1585-
1586-More results from queries before failure can be found in MYSQLTEST_VARDIR/log/bug11731.log
1587 drop table t1;
1588 Multi statement using expected error
1589 create table t1 (a int primary key);
1590@@ -725,4 +726,29 @@
1591 mysqltest: At line 1: change user failed: Unknown database 'inexistent'
1592 mysqltest: At line 1: change user failed: Access denied for user 'inexistent'@'localhost' (using password: NO)
1593 mysqltest: At line 1: change user failed: Access denied for user 'root'@'localhost' (using password: YES)
1594+file1.txt
1595+file1.txt
1596+file2.txt
1597+SELECT 'c:\\a.txt' AS col;
1598+col
1599+z
1600+hej
1601+mysqltest: At line 1: Found junk ' != 143' after $variable in expression
1602+select 1;
1603+1
1604+1
1605+select 1;
1606+1
1607+1
1608+-- a comment for the server;
1609+mysqltest: At line 1: Found line beginning with -- that didn't contain a valid mysqltest command, check your syntax or use # if you intended to write a comment
1610+con1
1611+con2
1612+default
1613+con1
1614+con2
1615+con1
1616+con2
1617+con2
1618+-closed_connection-
1619 End of tests
1620
1621=== modified file 'test/mysql-test/r/null.result'
1622--- test/mysql-test/r/null.result 2009-03-27 20:05:34 +0000
1623+++ test/mysql-test/r/null.result 2009-06-02 18:58:34 +0000
1624@@ -93,9 +93,11 @@
1625 Warnings:
1626 Warning 1265 Data truncated for column 'd' at row 1
1627 UPDATE t1 SET d=1/NULL;
1628-ERROR 23000: Column 'd' cannot be null
1629+Warnings:
1630+Warning 1265 Data truncated for column 'd' at row 1
1631 UPDATE t1 SET d=NULL;
1632-ERROR 23000: Column 'd' cannot be null
1633+Warnings:
1634+Warning 1048 Column 'd' cannot be null
1635 INSERT INTO t1 (a) values (null);
1636 ERROR 23000: Column 'a' cannot be null
1637 INSERT INTO t1 (a) values (1/null);
1638@@ -130,7 +132,7 @@
1639 Warning 1048 Column 'd' cannot be null
1640 select * from t1;
1641 a b c d
1642- 0 0000-00-00 00:00:00 2003
1643+ 0 0000-00-00 00:00:00 0
1644 0 0000-00-00 00:00:00 0
1645 0 0000-00-00 00:00:00 0
1646 0 0000-00-00 00:00:00 0
1647
1648=== modified file 'test/mysql-test/r/packet.result'
1649--- test/mysql-test/r/packet.result 2008-03-11 16:31:13 +0000
1650+++ test/mysql-test/r/packet.result 2009-06-02 19:02:51 +0000
1651@@ -1,35 +1,29 @@
1652+set @max_allowed_packet=@@global.max_allowed_packet;
1653+set @net_buffer_length=@@global.net_buffer_length;
1654 set global max_allowed_packet=100;
1655 Warnings:
1656 Warning 1292 Truncated incorrect max_allowed_packet value: '100'
1657-set max_allowed_packet=100;
1658-Warnings:
1659-Warning 1292 Truncated incorrect max_allowed_packet value: '100'
1660 set global net_buffer_length=100;
1661 Warnings:
1662 Warning 1292 Truncated incorrect net_buffer_length value: '100'
1663-set net_buffer_length=100;
1664-Warnings:
1665-Warning 1292 Truncated incorrect net_buffer_length value: '100'
1666 SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
1667 len
1668 1024
1669 select repeat('a',2000);
1670 repeat('a',2000)
1671-NULL
1672-Warnings:
1673-Warning 1301 Result of repeat() was larger than max_allowed_packet (1024) - truncated
1674+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
1675 select @@net_buffer_length, @@max_allowed_packet;
1676 @@net_buffer_length @@max_allowed_packet
1677 1024 1024
1678 SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
1679 ERROR 08S01: Got a packet bigger than 'max_allowed_packet' bytes
1680 set global max_allowed_packet=default;
1681-set max_allowed_packet=default;
1682 set global net_buffer_length=default;
1683-set net_buffer_length=default;
1684 SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
1685 len
1686 100
1687 select length(repeat('a',2000));
1688 length(repeat('a',2000))
1689 2000
1690+set global max_allowed_packet=@max_allowed_packet;
1691+set global net_buffer_length=@net_buffer_length;
1692
1693=== modified file 'test/mysql-test/r/partition.result'
1694--- test/mysql-test/r/partition.result 2008-09-17 07:41:28 +0000
1695+++ test/mysql-test/r/partition.result 2009-06-02 19:05:33 +0000
1696@@ -76,13 +76,21 @@
1697 Table Create Table
1698 t1 CREATE TABLE `t1` (
1699 `a` int(11) DEFAULT NULL
1700-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY KEY (a) (PARTITION p0 VALUES LESS THAN (1) ENGINE = PBXT, PARTITION p1 VALUES LESS THAN (2) ENGINE = PBXT) */
1701+) ENGINE=PBXT DEFAULT CHARSET=latin1
1702+/*!50100 PARTITION BY RANGE (a)
1703+SUBPARTITION BY KEY (a)
1704+(PARTITION p0 VALUES LESS THAN (1) ENGINE = PBXT,
1705+ PARTITION p1 VALUES LESS THAN (2) ENGINE = PBXT) */
1706 alter table t1 reorganize partition p1 into (partition p1 values less than (3));
1707 show create table t1;
1708 Table Create Table
1709 t1 CREATE TABLE `t1` (
1710 `a` int(11) DEFAULT NULL
1711-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY KEY (a) (PARTITION p0 VALUES LESS THAN (1) ENGINE = PBXT, PARTITION p1 VALUES LESS THAN (3) ENGINE = PBXT) */
1712+) ENGINE=PBXT DEFAULT CHARSET=latin1
1713+/*!50100 PARTITION BY RANGE (a)
1714+SUBPARTITION BY KEY (a)
1715+(PARTITION p0 VALUES LESS THAN (1) ENGINE = PBXT,
1716+ PARTITION p1 VALUES LESS THAN (3) ENGINE = PBXT) */
1717 drop table t1;
1718 CREATE TABLE t1 (
1719 a int not null,
1720@@ -100,7 +108,8 @@
1721 `b` int(11) NOT NULL,
1722 `c` int(11) NOT NULL,
1723 PRIMARY KEY (`a`,`b`)
1724-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) */
1725+) ENGINE=PBXT DEFAULT CHARSET=latin1
1726+/*!50100 PARTITION BY KEY (a) */
1727 drop table t1;
1728 CREATE TABLE t1 (
1729 a int not null,
1730@@ -277,7 +286,9 @@
1731 Table Create Table
1732 t1 CREATE TABLE `t1` (
1733 `a` int(11) DEFAULT NULL
1734-) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (a) (PARTITION x1 VALUES IN (1) ENGINE = MEMORY) */
1735+) ENGINE=MEMORY DEFAULT CHARSET=latin1
1736+/*!50100 PARTITION BY LIST (a)
1737+(PARTITION x1 VALUES IN (1) ENGINE = MEMORY) */
1738 drop table t1;
1739 CREATE TABLE t1 (a int, unique(a))
1740 PARTITION BY LIST (a)
1741@@ -301,7 +312,9 @@
1742 Table Create Table
1743 t1 CREATE TABLE `t1` (
1744 `a` int(11) DEFAULT NULL
1745-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (a) PARTITIONS 5 */
1746+) ENGINE=PBXT DEFAULT CHARSET=latin1
1747+/*!50100 PARTITION BY HASH (a)
1748+PARTITIONS 5 */
1749 drop table t1;
1750 CREATE TABLE t1 (a int)
1751 PARTITION BY RANGE (a)
1752@@ -328,7 +341,11 @@
1753 Table Create Table
1754 t1 CREATE TABLE `t1` (
1755 `a` int(11) DEFAULT NULL
1756-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (10) ENGINE = PBXT, PARTITION p1 VALUES LESS THAN (20) ENGINE = PBXT, PARTITION p2 VALUES LESS THAN (30) ENGINE = PBXT) */
1757+) ENGINE=PBXT DEFAULT CHARSET=latin1
1758+/*!50100 PARTITION BY RANGE (a)
1759+(PARTITION p0 VALUES LESS THAN (10) ENGINE = PBXT,
1760+ PARTITION p1 VALUES LESS THAN (20) ENGINE = PBXT,
1761+ PARTITION p2 VALUES LESS THAN (30) ENGINE = PBXT) */
1762 drop table t1;
1763 CREATE TABLE t1 (a int, b int)
1764 PARTITION BY RANGE (a)
1765@@ -349,7 +366,16 @@
1766 t1 CREATE TABLE `t1` (
1767 `a` int(11) DEFAULT NULL,
1768 `b` int(11) DEFAULT NULL
1769-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) (PARTITION x1 VALUES LESS THAN (6) ENGINE = PBXT, PARTITION x3 VALUES LESS THAN (8) ENGINE = PBXT, PARTITION x4 VALUES LESS THAN (10) ENGINE = PBXT, PARTITION x5 VALUES LESS THAN (12) ENGINE = PBXT, PARTITION x6 VALUES LESS THAN (14) ENGINE = PBXT, PARTITION x7 VALUES LESS THAN (16) ENGINE = PBXT, PARTITION x8 VALUES LESS THAN (18) ENGINE = PBXT, PARTITION x9 VALUES LESS THAN (20) ENGINE = PBXT) */
1770+) ENGINE=PBXT DEFAULT CHARSET=latin1
1771+/*!50100 PARTITION BY RANGE (a)
1772+(PARTITION x1 VALUES LESS THAN (6) ENGINE = PBXT,
1773+ PARTITION x3 VALUES LESS THAN (8) ENGINE = PBXT,
1774+ PARTITION x4 VALUES LESS THAN (10) ENGINE = PBXT,
1775+ PARTITION x5 VALUES LESS THAN (12) ENGINE = PBXT,
1776+ PARTITION x6 VALUES LESS THAN (14) ENGINE = PBXT,
1777+ PARTITION x7 VALUES LESS THAN (16) ENGINE = PBXT,
1778+ PARTITION x8 VALUES LESS THAN (18) ENGINE = PBXT,
1779+ PARTITION x9 VALUES LESS THAN (20) ENGINE = PBXT) */
1780 drop table t1;
1781 create table t1 (a int not null, b int not null) partition by LIST (a+b) (
1782 partition p0 values in (12),
1783@@ -403,25 +429,37 @@
1784 Table Create Table
1785 t1 CREATE TABLE `t1` (
1786 `a` int(11) DEFAULT NULL
1787-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */
1788+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1789+/*!50100 PARTITION BY KEY (a)
1790+(PARTITION p0 ENGINE = MyISAM,
1791+ PARTITION p1 ENGINE = MyISAM) */
1792 alter table t1;
1793 show create table t1;
1794 Table Create Table
1795 t1 CREATE TABLE `t1` (
1796 `a` int(11) DEFAULT NULL
1797-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */
1798+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1799+/*!50100 PARTITION BY KEY (a)
1800+(PARTITION p0 ENGINE = MyISAM,
1801+ PARTITION p1 ENGINE = MyISAM) */
1802 alter table t1 engine=myisam;
1803 show create table t1;
1804 Table Create Table
1805 t1 CREATE TABLE `t1` (
1806 `a` int(11) DEFAULT NULL
1807-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */
1808+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1809+/*!50100 PARTITION BY KEY (a)
1810+(PARTITION p0 ENGINE = MyISAM,
1811+ PARTITION p1 ENGINE = MyISAM) */
1812 alter table t1 engine=heap;
1813 show create table t1;
1814 Table Create Table
1815 t1 CREATE TABLE `t1` (
1816 `a` int(11) DEFAULT NULL
1817-) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */
1818+) ENGINE=MEMORY DEFAULT CHARSET=latin1
1819+/*!50100 PARTITION BY KEY (a)
1820+(PARTITION p0 ENGINE = MEMORY,
1821+ PARTITION p1 ENGINE = MEMORY) */
1822 alter table t1 remove partitioning;
1823 show create table t1;
1824 Table Create Table
1825@@ -438,7 +476,10 @@
1826 Table Create Table
1827 t1 CREATE TABLE `t1` (
1828 `a` int(11) DEFAULT NULL
1829-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */
1830+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1831+/*!50100 PARTITION BY KEY (a)
1832+(PARTITION p0 ENGINE = MyISAM,
1833+ PARTITION p1 ENGINE = MyISAM) */
1834 alter table t1 add column b int remove partitioning;
1835 show create table t1;
1836 Table Create Table
1837@@ -455,7 +496,10 @@
1838 t1 CREATE TABLE `t1` (
1839 `a` int(11) DEFAULT NULL,
1840 `b` int(11) DEFAULT NULL
1841-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */
1842+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1843+/*!50100 PARTITION BY KEY (a)
1844+(PARTITION p0 ENGINE = MyISAM,
1845+ PARTITION p1 ENGINE = MyISAM) */
1846 alter table t1
1847 engine=heap
1848 partition by key(a)
1849@@ -465,7 +509,10 @@
1850 t1 CREATE TABLE `t1` (
1851 `a` int(11) DEFAULT NULL,
1852 `b` int(11) DEFAULT NULL
1853-) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */
1854+) ENGINE=MEMORY DEFAULT CHARSET=latin1
1855+/*!50100 PARTITION BY KEY (a)
1856+(PARTITION p0 ENGINE = MEMORY,
1857+ PARTITION p1 ENGINE = MEMORY) */
1858 alter table t1 engine=myisam, add column c int remove partitioning;
1859 show create table t1;
1860 Table Create Table
1861@@ -484,7 +531,10 @@
1862 `a` int(11) DEFAULT NULL,
1863 `b` int(11) DEFAULT NULL,
1864 `c` int(11) DEFAULT NULL
1865-) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */
1866+) ENGINE=MEMORY DEFAULT CHARSET=latin1
1867+/*!50100 PARTITION BY KEY (a)
1868+(PARTITION p0 ENGINE = MEMORY,
1869+ PARTITION p1 ENGINE = MEMORY) */
1870 alter table t1
1871 partition by key (a)
1872 (partition p0, partition p1);
1873@@ -494,7 +544,10 @@
1874 `a` int(11) DEFAULT NULL,
1875 `b` int(11) DEFAULT NULL,
1876 `c` int(11) DEFAULT NULL
1877-) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */
1878+) ENGINE=MEMORY DEFAULT CHARSET=latin1
1879+/*!50100 PARTITION BY KEY (a)
1880+(PARTITION p0 ENGINE = MEMORY,
1881+ PARTITION p1 ENGINE = MEMORY) */
1882 alter table t1
1883 engine=heap
1884 partition by key (a)
1885@@ -505,7 +558,10 @@
1886 `a` int(11) DEFAULT NULL,
1887 `b` int(11) DEFAULT NULL,
1888 `c` int(11) DEFAULT NULL
1889-) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MEMORY, PARTITION p1 ENGINE = MEMORY) */
1890+) ENGINE=MEMORY DEFAULT CHARSET=latin1
1891+/*!50100 PARTITION BY KEY (a)
1892+(PARTITION p0 ENGINE = MEMORY,
1893+ PARTITION p1 ENGINE = MEMORY) */
1894 alter table t1
1895 partition by key(a)
1896 (partition p0, partition p1 engine=heap);
1897@@ -648,14 +704,23 @@
1898 Table Create Table
1899 t1 CREATE TABLE `t1` (
1900 `a` int(11) DEFAULT NULL
1901-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM) */
1902+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1903+/*!50100 PARTITION BY RANGE (a)
1904+SUBPARTITION BY HASH (a)
1905+(PARTITION p0 VALUES LESS THAN (100) ENGINE = MyISAM) */
1906 alter table t1 add partition (partition p1 values less than (200)
1907 (subpartition subpart21));
1908 show create table t1;
1909 Table Create Table
1910 t1 CREATE TABLE `t1` (
1911 `a` int(11) DEFAULT NULL
1912-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p0 VALUES LESS THAN (100) (SUBPARTITION p0sp0 ENGINE = MyISAM), PARTITION p1 VALUES LESS THAN (200) (SUBPARTITION subpart21 ENGINE = MyISAM)) */
1913+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1914+/*!50100 PARTITION BY RANGE (a)
1915+SUBPARTITION BY HASH (a)
1916+(PARTITION p0 VALUES LESS THAN (100)
1917+ (SUBPARTITION p0sp0 ENGINE = MyISAM),
1918+ PARTITION p1 VALUES LESS THAN (200)
1919+ (SUBPARTITION subpart21 ENGINE = MyISAM)) */
1920 drop table t1;
1921 create table t1 (a int)
1922 partition by key (a);
1923@@ -663,13 +728,17 @@
1924 Table Create Table
1925 t1 CREATE TABLE `t1` (
1926 `a` int(11) DEFAULT NULL
1927-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) */
1928+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1929+/*!50100 PARTITION BY KEY (a) */
1930 alter table t1 add partition (partition p1);
1931 show create table t1;
1932 Table Create Table
1933 t1 CREATE TABLE `t1` (
1934 `a` int(11) DEFAULT NULL
1935-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE = MyISAM, PARTITION p1 ENGINE = MyISAM) */
1936+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1937+/*!50100 PARTITION BY KEY (a)
1938+(PARTITION p0 ENGINE = MyISAM,
1939+ PARTITION p1 ENGINE = MyISAM) */
1940 drop table t1;
1941 create table t1 (a int, b int)
1942 partition by range (a)
1943@@ -746,7 +815,10 @@
1944 t1 CREATE TABLE `t1` (
1945 `a` int(11) DEFAULT NULL,
1946 `b` int(11) DEFAULT NULL
1947-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (a) (PARTITION p1 VALUES IN (1) ENGINE = MyISAM, PARTITION p2 VALUES IN (2) ENGINE = MyISAM) */
1948+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1949+/*!50100 PARTITION BY LIST (a)
1950+(PARTITION p1 VALUES IN (1) ENGINE = MyISAM,
1951+ PARTITION p2 VALUES IN (2) ENGINE = MyISAM) */
1952 drop table t1;
1953 create table t1 (a int unsigned not null auto_increment primary key)
1954 partition by key(a);
1955@@ -757,7 +829,8 @@
1956 `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
1957 `c` char(10) DEFAULT NULL,
1958 PRIMARY KEY (`a`)
1959-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment' /*!50100 PARTITION BY KEY (a) */
1960+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment'
1961+/*!50100 PARTITION BY KEY (a) */
1962 drop table t2;
1963 create table t1 (f1 int) partition by hash (f1) as select 1;
1964 drop table t1;
1965@@ -954,7 +1027,9 @@
1966 Table Create Table
1967 t1 CREATE TABLE `t1` (
1968 `a` int(11) DEFAULT NULL
1969-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (a) (PARTITION p0 VALUES IN (NULL) ENGINE = MyISAM) */
1970+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1971+/*!50100 PARTITION BY LIST (a)
1972+(PARTITION p0 VALUES IN (NULL) ENGINE = MyISAM) */
1973 DROP TABLE t1;
1974 CREATE TABLE t1 (a int)
1975 PARTITION BY RANGE(a)
1976@@ -990,7 +1065,9 @@
1977 Table Create Table
1978 t1 CREATE TABLE `t1` (
1979 `a` int(11) DEFAULT NULL
1980-) /*!50100 PARTITION BY KEY (a) (PARTITION p0) */
1981+)
1982+/*!50100 PARTITION BY KEY (a)
1983+(PARTITION p0) */
1984 set session sql_mode='';
1985 drop table t1;
1986 create table t1 (a int)
1987@@ -1004,7 +1081,8 @@
1988 Table Create Table
1989 t1 CREATE TABLE `t1` (
1990 `a` varchar(1) DEFAULT NULL
1991-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) */
1992+) ENGINE=MyISAM DEFAULT CHARSET=latin1
1993+/*!50100 PARTITION BY KEY (a) */
1994 drop table t1;
1995 CREATE TABLE t1 (a int) ENGINE = MYISAM PARTITION BY KEY(a);
1996 INSERT into t1 values (1), (2);
1997@@ -1073,7 +1151,9 @@
1998 t1 CREATE TABLE `t1` (
1999 `a` bigint(20) unsigned NOT NULL,
2000 PRIMARY KEY (`a`)
2001-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) PARTITIONS 10 */
2002+) ENGINE=MyISAM DEFAULT CHARSET=latin1
2003+/*!50100 PARTITION BY KEY (a)
2004+PARTITIONS 10 */
2005 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE),
2006 (18446744073709551613), (18446744073709551612);
2007 select * from t1;
2008
2009=== modified file 'test/mysql-test/r/partition_02myisam.result'
2010--- test/mysql-test/r/partition_02myisam.result 2008-06-09 12:49:32 +0000
2011+++ test/mysql-test/r/partition_02myisam.result 2009-06-02 20:12:58 +0000
2012@@ -92,7 +92,9 @@
2013 t1 CREATE TABLE `t1` (
2014 `f1` int(11) DEFAULT NULL,
2015 `f2` char(20) DEFAULT NULL
2016-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) PARTITIONS 2 */
2017+) ENGINE=PBXT DEFAULT CHARSET=latin1
2018+/*!50100 PARTITION BY HASH (f1)
2019+PARTITIONS 2 */
2020 SELECT COUNT(*) = 0 AS my_value FROM t1;
2021 my_value
2022 1
2023@@ -147,7 +149,10 @@
2024 t1 CREATE TABLE `t1` (
2025 `f1` int(11) DEFAULT NULL,
2026 `f2` char(20) DEFAULT NULL
2027-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part2 ENGINE = PBXT) */
2028+) ENGINE=PBXT DEFAULT CHARSET=latin1
2029+/*!50100 PARTITION BY HASH (f1)
2030+(PARTITION part1 ENGINE = PBXT,
2031+ PARTITION part2 ENGINE = PBXT) */
2032 SELECT COUNT(*) = 0 AS my_value FROM t1;
2033 my_value
2034 1
2035@@ -205,7 +210,15 @@
2036 t1 CREATE TABLE `t1` (
2037 `f1` int(11) DEFAULT NULL,
2038 `f2` char(20) DEFAULT NULL
2039-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = PBXT, SUBPARTITION subpart12 ENGINE = PBXT), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = PBXT, SUBPARTITION subpart22 ENGINE = PBXT)) */
2040+) ENGINE=PBXT DEFAULT CHARSET=latin1
2041+/*!50100 PARTITION BY RANGE (f1)
2042+SUBPARTITION BY HASH (f1)
2043+(PARTITION part1 VALUES LESS THAN (100)
2044+ (SUBPARTITION subpart11 ENGINE = PBXT,
2045+ SUBPARTITION subpart12 ENGINE = PBXT),
2046+ PARTITION part2 VALUES LESS THAN (2147483647)
2047+ (SUBPARTITION subpart21 ENGINE = PBXT,
2048+ SUBPARTITION subpart22 ENGINE = PBXT)) */
2049 SELECT COUNT(*) = 0 AS my_value FROM t1;
2050 my_value
2051 1
2052@@ -260,7 +273,10 @@
2053 t1 CREATE TABLE `t1` (
2054 `f1` int(11) DEFAULT NULL,
2055 `f2` char(20) DEFAULT NULL
2056-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part2 ENGINE = PBXT) */
2057+) ENGINE=PBXT DEFAULT CHARSET=latin1
2058+/*!50100 PARTITION BY HASH (f1)
2059+(PARTITION part1 ENGINE = PBXT,
2060+ PARTITION part2 ENGINE = PBXT) */
2061 SELECT COUNT(*) = 0 AS my_value FROM t1;
2062 my_value
2063 1
2064@@ -313,7 +329,10 @@
2065 t1 CREATE TABLE `t1` (
2066 `f1` int(11) DEFAULT NULL,
2067 `f2` char(20) DEFAULT NULL
2068-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part2 ENGINE = PBXT) */
2069+) ENGINE=PBXT DEFAULT CHARSET=latin1
2070+/*!50100 PARTITION BY HASH (f1)
2071+(PARTITION part1 ENGINE = PBXT,
2072+ PARTITION part2 ENGINE = PBXT) */
2073 SELECT COUNT(*) = 0 AS my_value FROM t1;
2074 my_value
2075 1
2076@@ -371,7 +390,15 @@
2077 t1 CREATE TABLE `t1` (
2078 `f1` int(11) DEFAULT NULL,
2079 `f2` char(20) DEFAULT NULL
2080-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = PBXT, SUBPARTITION subpart12 ENGINE = PBXT), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = PBXT, SUBPARTITION subpart22 ENGINE = PBXT)) */
2081+) ENGINE=PBXT DEFAULT CHARSET=latin1
2082+/*!50100 PARTITION BY RANGE (f1)
2083+SUBPARTITION BY HASH (f1)
2084+(PARTITION part1 VALUES LESS THAN (100)
2085+ (SUBPARTITION subpart11 ENGINE = PBXT,
2086+ SUBPARTITION subpart12 ENGINE = PBXT),
2087+ PARTITION part2 VALUES LESS THAN (2147483647)
2088+ (SUBPARTITION subpart21 ENGINE = PBXT,
2089+ SUBPARTITION subpart22 ENGINE = PBXT)) */
2090 SELECT COUNT(*) = 0 AS my_value FROM t1;
2091 my_value
2092 1
2093@@ -429,7 +456,15 @@
2094 t1 CREATE TABLE `t1` (
2095 `f1` int(11) DEFAULT NULL,
2096 `f2` char(20) DEFAULT NULL
2097-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = PBXT, SUBPARTITION subpart12 ENGINE = PBXT), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = PBXT, SUBPARTITION subpart22 ENGINE = PBXT)) */
2098+) ENGINE=PBXT DEFAULT CHARSET=latin1
2099+/*!50100 PARTITION BY RANGE (f1)
2100+SUBPARTITION BY HASH (f1)
2101+(PARTITION part1 VALUES LESS THAN (100)
2102+ (SUBPARTITION subpart11 ENGINE = PBXT,
2103+ SUBPARTITION subpart12 ENGINE = PBXT),
2104+ PARTITION part2 VALUES LESS THAN (2147483647)
2105+ (SUBPARTITION subpart21 ENGINE = PBXT,
2106+ SUBPARTITION subpart22 ENGINE = PBXT)) */
2107 SELECT COUNT(*) = 0 AS my_value FROM t1;
2108 my_value
2109 1
2110@@ -489,7 +524,15 @@
2111 t1 CREATE TABLE `t1` (
2112 `f1` int(11) DEFAULT NULL,
2113 `f2` char(20) DEFAULT NULL
2114-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = PBXT, SUBPARTITION subpart12 ENGINE = PBXT), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = PBXT, SUBPARTITION subpart22 ENGINE = PBXT)) */
2115+) ENGINE=PBXT DEFAULT CHARSET=latin1
2116+/*!50100 PARTITION BY RANGE (f1)
2117+SUBPARTITION BY HASH (f1)
2118+(PARTITION part1 VALUES LESS THAN (100)
2119+ (SUBPARTITION subpart11 ENGINE = PBXT,
2120+ SUBPARTITION subpart12 ENGINE = PBXT),
2121+ PARTITION part2 VALUES LESS THAN (2147483647)
2122+ (SUBPARTITION subpart21 ENGINE = PBXT,
2123+ SUBPARTITION subpart22 ENGINE = PBXT)) */
2124 SELECT COUNT(*) = 0 AS my_value FROM t1;
2125 my_value
2126 1
2127@@ -547,7 +590,15 @@
2128 t1 CREATE TABLE `t1` (
2129 `f1` int(11) DEFAULT NULL,
2130 `f2` char(20) DEFAULT NULL
2131-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = PBXT, SUBPARTITION subpart12 ENGINE = PBXT), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = PBXT, SUBPARTITION subpart22 ENGINE = PBXT)) */
2132+) ENGINE=PBXT DEFAULT CHARSET=latin1
2133+/*!50100 PARTITION BY RANGE (f1)
2134+SUBPARTITION BY HASH (f1)
2135+(PARTITION part1 VALUES LESS THAN (100)
2136+ (SUBPARTITION subpart11 ENGINE = PBXT,
2137+ SUBPARTITION subpart12 ENGINE = PBXT),
2138+ PARTITION part2 VALUES LESS THAN (2147483647)
2139+ (SUBPARTITION subpart21 ENGINE = PBXT,
2140+ SUBPARTITION subpart22 ENGINE = PBXT)) */
2141 SELECT COUNT(*) = 0 AS my_value FROM t1;
2142 my_value
2143 1
2144@@ -603,7 +654,10 @@
2145 t1 CREATE TABLE `t1` (
2146 `f1` int(11) DEFAULT NULL,
2147 `f2` char(20) DEFAULT NULL
2148-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part2 ENGINE = PBXT) */
2149+) ENGINE=PBXT DEFAULT CHARSET=latin1
2150+/*!50100 PARTITION BY HASH (f1)
2151+(PARTITION part1 ENGINE = PBXT,
2152+ PARTITION part2 ENGINE = PBXT) */
2153 SELECT COUNT(*) = 0 AS my_value FROM t1;
2154 my_value
2155 1
2156@@ -661,7 +715,15 @@
2157 t1 CREATE TABLE `t1` (
2158 `f1` int(11) DEFAULT NULL,
2159 `f2` char(20) DEFAULT NULL
2160-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = PBXT, SUBPARTITION subpart12 ENGINE = PBXT), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = PBXT, SUBPARTITION subpart22 ENGINE = PBXT)) */
2161+) ENGINE=PBXT DEFAULT CHARSET=latin1
2162+/*!50100 PARTITION BY RANGE (f1)
2163+SUBPARTITION BY HASH (f1)
2164+(PARTITION part1 VALUES LESS THAN (100)
2165+ (SUBPARTITION subpart11 ENGINE = PBXT,
2166+ SUBPARTITION subpart12 ENGINE = PBXT),
2167+ PARTITION part2 VALUES LESS THAN (2147483647)
2168+ (SUBPARTITION subpart21 ENGINE = PBXT,
2169+ SUBPARTITION subpart22 ENGINE = PBXT)) */
2170 SELECT COUNT(*) = 0 AS my_value FROM t1;
2171 my_value
2172 1
2173@@ -721,7 +783,15 @@
2174 t1 CREATE TABLE `t1` (
2175 `f1` int(11) DEFAULT NULL,
2176 `f2` char(20) DEFAULT NULL
2177-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = PBXT, SUBPARTITION subpart12 ENGINE = PBXT), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = PBXT, SUBPARTITION subpart22 ENGINE = PBXT)) */
2178+) ENGINE=PBXT DEFAULT CHARSET=latin1
2179+/*!50100 PARTITION BY RANGE (f1)
2180+SUBPARTITION BY HASH (f1)
2181+(PARTITION part1 VALUES LESS THAN (100)
2182+ (SUBPARTITION subpart11 ENGINE = PBXT,
2183+ SUBPARTITION subpart12 ENGINE = PBXT),
2184+ PARTITION part2 VALUES LESS THAN (2147483647)
2185+ (SUBPARTITION subpart21 ENGINE = PBXT,
2186+ SUBPARTITION subpart22 ENGINE = PBXT)) */
2187 SELECT COUNT(*) = 0 AS my_value FROM t1;
2188 my_value
2189 1
2190@@ -782,7 +852,8 @@
2191 t1 CREATE TABLE `t1` (
2192 `f1` int(11) DEFAULT NULL,
2193 `f2` char(20) DEFAULT NULL
2194-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) */
2195+) ENGINE=PBXT DEFAULT CHARSET=latin1
2196+/*!50100 PARTITION BY HASH (f1) */
2197 SELECT COUNT(*) = 0 AS my_value FROM t1;
2198 my_value
2199 1
2200@@ -833,7 +904,10 @@
2201 t1 CREATE TABLE `t1` (
2202 `f1` int(11) DEFAULT NULL,
2203 `f2` char(20) DEFAULT NULL
2204-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part2 ENGINE = PBXT) */
2205+) ENGINE=PBXT DEFAULT CHARSET=latin1
2206+/*!50100 PARTITION BY HASH (f1)
2207+(PARTITION part1 ENGINE = PBXT,
2208+ PARTITION part2 ENGINE = PBXT) */
2209 SELECT COUNT(*) = 0 AS my_value FROM t1;
2210 my_value
2211 1
2212@@ -891,7 +965,18 @@
2213 t1 CREATE TABLE `t1` (
2214 `f1` int(11) DEFAULT NULL,
2215 `f2` char(20) DEFAULT NULL
2216-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = PBXT, SUBPARTITION subpart12 ENGINE = PBXT), PARTITION part2 VALUES LESS THAN (200) (SUBPARTITION subpart21 ENGINE = PBXT, SUBPARTITION subpart22 ENGINE = PBXT), PARTITION part3 VALUES LESS THAN (2147483647) (SUBPARTITION subpart31 ENGINE = PBXT, SUBPARTITION subpart32 ENGINE = PBXT)) */
2217+) ENGINE=PBXT DEFAULT CHARSET=latin1
2218+/*!50100 PARTITION BY RANGE (f1)
2219+SUBPARTITION BY HASH (f1)
2220+(PARTITION part1 VALUES LESS THAN (100)
2221+ (SUBPARTITION subpart11 ENGINE = PBXT,
2222+ SUBPARTITION subpart12 ENGINE = PBXT),
2223+ PARTITION part2 VALUES LESS THAN (200)
2224+ (SUBPARTITION subpart21 ENGINE = PBXT,
2225+ SUBPARTITION subpart22 ENGINE = PBXT),
2226+ PARTITION part3 VALUES LESS THAN (2147483647)
2227+ (SUBPARTITION subpart31 ENGINE = PBXT,
2228+ SUBPARTITION subpart32 ENGINE = PBXT)) */
2229 SELECT COUNT(*) = 0 AS my_value FROM t1;
2230 my_value
2231 1
2232@@ -944,7 +1029,9 @@
2233 t1 CREATE TABLE `t1` (
2234 `f1` int(11) DEFAULT NULL,
2235 `f2` char(20) DEFAULT NULL
2236-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) PARTITIONS 2 */
2237+) ENGINE=PBXT DEFAULT CHARSET=latin1
2238+/*!50100 PARTITION BY HASH (f1)
2239+PARTITIONS 2 */
2240 SELECT COUNT(*) = 0 AS my_value FROM t1;
2241 my_value
2242 1
2243@@ -996,7 +1083,12 @@
2244 t1 CREATE TABLE `t1` (
2245 `f1` int(11) DEFAULT NULL,
2246 `f2` char(20) DEFAULT NULL
2247-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 2 (PARTITION part1 VALUES LESS THAN (100) ENGINE = PBXT, PARTITION part2 VALUES LESS THAN (2147483647) ENGINE = PBXT) */
2248+) ENGINE=PBXT DEFAULT CHARSET=latin1
2249+/*!50100 PARTITION BY RANGE (f1)
2250+SUBPARTITION BY HASH (f1)
2251+SUBPARTITIONS 2
2252+(PARTITION part1 VALUES LESS THAN (100) ENGINE = PBXT,
2253+ PARTITION part2 VALUES LESS THAN (2147483647) ENGINE = PBXT) */
2254 SELECT COUNT(*) = 0 AS my_value FROM t1;
2255 my_value
2256 1
2257@@ -1046,7 +1138,9 @@
2258 t1 CREATE TABLE `t1` (
2259 `f1` int(11) DEFAULT NULL,
2260 `f2` char(20) DEFAULT NULL
2261-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) PARTITIONS 1 */
2262+) ENGINE=PBXT DEFAULT CHARSET=latin1
2263+/*!50100 PARTITION BY HASH (f1)
2264+PARTITIONS 1 */
2265 SELECT COUNT(*) = 0 AS my_value FROM t1;
2266 my_value
2267 1
2268@@ -1098,7 +1192,12 @@
2269 t1 CREATE TABLE `t1` (
2270 `f1` int(11) DEFAULT NULL,
2271 `f2` char(20) DEFAULT NULL
2272-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 1 (PARTITION part1 VALUES LESS THAN (100) ENGINE = PBXT, PARTITION part2 VALUES LESS THAN (2147483647) ENGINE = PBXT) */
2273+) ENGINE=PBXT DEFAULT CHARSET=latin1
2274+/*!50100 PARTITION BY RANGE (f1)
2275+SUBPARTITION BY HASH (f1)
2276+SUBPARTITIONS 1
2277+(PARTITION part1 VALUES LESS THAN (100) ENGINE = PBXT,
2278+ PARTITION part2 VALUES LESS THAN (2147483647) ENGINE = PBXT) */
2279 SELECT COUNT(*) = 0 AS my_value FROM t1;
2280 my_value
2281 1
2282@@ -1304,7 +1403,10 @@
2283 t1 CREATE TABLE `t1` (
2284 `f1` int(11) DEFAULT NULL,
2285 `f2` char(20) DEFAULT NULL
2286-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part2 ENGINE = PBXT) */
2287+) ENGINE=PBXT DEFAULT CHARSET=latin1
2288+/*!50100 PARTITION BY HASH (f1)
2289+(PARTITION part1 ENGINE = PBXT,
2290+ PARTITION part2 ENGINE = PBXT) */
2291 DROP TABLE t1;
2292 CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
2293 PARTITION BY RANGE(f1) PARTITIONS 2
2294@@ -1319,7 +1421,15 @@
2295 t1 CREATE TABLE `t1` (
2296 `f1` int(11) DEFAULT NULL,
2297 `f2` char(20) DEFAULT NULL
2298-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = PBXT, SUBPARTITION subpart12 ENGINE = PBXT), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = PBXT, SUBPARTITION subpart22 ENGINE = PBXT)) */
2299+) ENGINE=PBXT DEFAULT CHARSET=latin1
2300+/*!50100 PARTITION BY RANGE (f1)
2301+SUBPARTITION BY HASH (f1)
2302+(PARTITION part1 VALUES LESS THAN (1000)
2303+ (SUBPARTITION subpart11 ENGINE = PBXT,
2304+ SUBPARTITION subpart12 ENGINE = PBXT),
2305+ PARTITION part2 VALUES LESS THAN (2147483647)
2306+ (SUBPARTITION subpart21 ENGINE = PBXT,
2307+ SUBPARTITION subpart22 ENGINE = PBXT)) */
2308 DROP TABLE t1;
2309 # 3.3.2 (positive) number of partition/subpartition ,
2310 # 0 (= no) named partition/subpartition
2311@@ -1446,7 +1556,8 @@
2312 t1 CREATE TABLE `t1` (
2313 `f1` int(11) DEFAULT NULL,
2314 `f2` char(20) DEFAULT NULL
2315-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) */
2316+) ENGINE=PBXT DEFAULT CHARSET=latin1
2317+/*!50100 PARTITION BY HASH (f1) */
2318 INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
2319 ALTER TABLE t1 ADD PARTITION (PARTITION part1);
2320 SHOW CREATE TABLE t1;
2321@@ -1454,7 +1565,10 @@
2322 t1 CREATE TABLE `t1` (
2323 `f1` int(11) DEFAULT NULL,
2324 `f2` char(20) DEFAULT NULL
2325-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION p0 ENGINE = PBXT, PARTITION part1 ENGINE = PBXT) */
2326+) ENGINE=PBXT DEFAULT CHARSET=latin1
2327+/*!50100 PARTITION BY HASH (f1)
2328+(PARTITION p0 ENGINE = PBXT,
2329+ PARTITION part1 ENGINE = PBXT) */
2330 INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
2331 SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
2332 AS my_value FROM t1;
2333@@ -1502,7 +1616,10 @@
2334 t1 CREATE TABLE `t1` (
2335 `f1` int(11) DEFAULT NULL,
2336 `f2` char(20) DEFAULT NULL
2337-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part3 ENGINE = PBXT) */
2338+) ENGINE=PBXT DEFAULT CHARSET=latin1
2339+/*!50100 PARTITION BY HASH (f1)
2340+(PARTITION part1 ENGINE = PBXT,
2341+ PARTITION part3 ENGINE = PBXT) */
2342 INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
2343 ALTER TABLE t1 ADD PARTITION (PARTITION part0);
2344 SHOW CREATE TABLE t1;
2345@@ -1510,7 +1627,11 @@
2346 t1 CREATE TABLE `t1` (
2347 `f1` int(11) DEFAULT NULL,
2348 `f2` char(20) DEFAULT NULL
2349-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part3 ENGINE = PBXT, PARTITION part0 ENGINE = PBXT) */
2350+) ENGINE=PBXT DEFAULT CHARSET=latin1
2351+/*!50100 PARTITION BY HASH (f1)
2352+(PARTITION part1 ENGINE = PBXT,
2353+ PARTITION part3 ENGINE = PBXT,
2354+ PARTITION part0 ENGINE = PBXT) */
2355 INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
2356 SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
2357 AS my_value FROM t1;
2358@@ -1557,7 +1678,12 @@
2359 t1 CREATE TABLE `t1` (
2360 `f1` int(11) DEFAULT NULL,
2361 `f2` char(20) DEFAULT NULL
2362-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part3 ENGINE = PBXT, PARTITION part0 ENGINE = PBXT, PARTITION part2 ENGINE = PBXT) */
2363+) ENGINE=PBXT DEFAULT CHARSET=latin1
2364+/*!50100 PARTITION BY HASH (f1)
2365+(PARTITION part1 ENGINE = PBXT,
2366+ PARTITION part3 ENGINE = PBXT,
2367+ PARTITION part0 ENGINE = PBXT,
2368+ PARTITION part2 ENGINE = PBXT) */
2369 INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
2370 SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
2371 AS my_value FROM t1;
2372@@ -1603,7 +1729,12 @@
2373 t1 CREATE TABLE `t1` (
2374 `f1` int(11) DEFAULT NULL,
2375 `f2` char(20) DEFAULT NULL
2376-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part3 ENGINE = PBXT, PARTITION part0 ENGINE = PBXT, PARTITION part2 ENGINE = PBXT) */
2377+) ENGINE=PBXT DEFAULT CHARSET=latin1
2378+/*!50100 PARTITION BY HASH (f1)
2379+(PARTITION part1 ENGINE = PBXT,
2380+ PARTITION part3 ENGINE = PBXT,
2381+ PARTITION part0 ENGINE = PBXT,
2382+ PARTITION part2 ENGINE = PBXT) */
2383 INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
2384 SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
2385 AS my_value FROM t1;
2386@@ -1651,14 +1782,20 @@
2387 t1 CREATE TABLE `t1` (
2388 `f1` int(11) DEFAULT NULL,
2389 `f2` char(20) DEFAULT NULL
2390-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part3 ENGINE = PBXT) */
2391+) ENGINE=PBXT DEFAULT CHARSET=latin1
2392+/*!50100 PARTITION BY HASH (f1)
2393+(PARTITION part1 ENGINE = PBXT,
2394+ PARTITION part3 ENGINE = PBXT) */
2395 INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
2396 SHOW CREATE TABLE t1;
2397 Table Create Table
2398 t1 CREATE TABLE `t1` (
2399 `f1` int(11) DEFAULT NULL,
2400 `f2` char(20) DEFAULT NULL
2401-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = PBXT, PARTITION part3 ENGINE = PBXT) */
2402+) ENGINE=PBXT DEFAULT CHARSET=latin1
2403+/*!50100 PARTITION BY HASH (f1)
2404+(PARTITION part1 ENGINE = PBXT,
2405+ PARTITION part3 ENGINE = PBXT) */
2406 INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
2407 SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
2408 AS my_value FROM t1;
2409
2410=== modified file 'test/mysql-test/r/partition_mgm.result'
2411--- test/mysql-test/r/partition_mgm.result 2008-09-30 15:10:36 +0000
2412+++ test/mysql-test/r/partition_mgm.result 2009-06-02 20:12:58 +0000
2413@@ -17,7 +17,9 @@
2414 t1 CREATE TABLE `t1` (
2415 `f_date` date DEFAULT NULL,
2416 `f_varchar` varchar(30) DEFAULT NULL
2417-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) PARTITIONS 2 */
2418+) ENGINE=PBXT DEFAULT CHARSET=latin1
2419+/*!50100 PARTITION BY HASH (YEAR(f_date))
2420+PARTITIONS 2 */
2421 hello/master-data/test/t1#P#p0-1.xtr
2422 hello/master-data/test/t1#P#p0.xtd
2423 hello/master-data/test/t1#P#p0.xti
2424@@ -32,7 +34,9 @@
2425 t1 CREATE TABLE `t1` (
2426 `f_date` date DEFAULT NULL,
2427 `f_varchar` varchar(30) DEFAULT NULL
2428-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (YEAR(f_date)) PARTITIONS 1 */
2429+) ENGINE=PBXT DEFAULT CHARSET=latin1
2430+/*!50100 PARTITION BY HASH (YEAR(f_date))
2431+PARTITIONS 1 */
2432 hello/master-data/test/t1#P#p0-3.xtr
2433 hello/master-data/test/t1#P#p0.xtd
2434 hello/master-data/test/t1#P#p0.xti
2435
2436=== modified file 'test/mysql-test/r/partition_mgm_err.result'
2437--- test/mysql-test/r/partition_mgm_err.result 2006-10-23 09:14:04 +0000
2438+++ test/mysql-test/r/partition_mgm_err.result 2009-06-02 20:12:58 +0000
2439@@ -25,13 +25,13 @@
2440 ERROR HY000: Error in list of partitions to DROP
2441 ALTER TABLE t1 REORGANIZE PARTITION x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10 INTO
2442 (PARTITION x11 VALUES LESS THAN (22));
2443-ERROR HY000: More partitions to reorganise than there are partitions
2444+ERROR HY000: More partitions to reorganize than there are partitions
2445 ALTER TABLE t1 REORGANIZE PARTITION x0,x1,x2 INTO
2446 (PARTITION x3 VALUES LESS THAN (6));
2447 ERROR HY000: Duplicate partition name x3
2448 ALTER TABLE t1 REORGANIZE PARTITION x0, x2 INTO
2449 (PARTITION x11 VALUES LESS THAN (2));
2450-ERROR HY000: When reorganising a set of partitions they must be in consecutive order
2451+ERROR HY000: When reorganizing a set of partitions they must be in consecutive order
2452 ALTER TABLE t1 REORGANIZE PARTITION x0, x1, x1 INTO
2453 (PARTITION x11 VALUES LESS THAN (4));
2454 ERROR HY000: Error in list of partitions to REORGANIZE
2455@@ -136,7 +136,9 @@
2456 Table Create Table
2457 t1 CREATE TABLE `t1` (
2458 `a` int(11) DEFAULT NULL
2459-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) PARTITIONS 2 */
2460+) ENGINE=PBXT DEFAULT CHARSET=latin1
2461+/*!50100 PARTITION BY KEY (a)
2462+PARTITIONS 2 */
2463 DROP TABLE t1;
2464 CREATE TABLE t1 (a INT) PARTITION BY HASH(a);
2465 ALTER TABLE t1 ADD PARTITION PARTITIONS 4;
2466
2467=== modified file 'test/mysql-test/r/partition_range.result'
2468--- test/mysql-test/r/partition_range.result 2008-09-17 07:41:28 +0000
2469+++ test/mysql-test/r/partition_range.result 2009-06-02 20:12:58 +0000
2470@@ -104,7 +104,11 @@
2471 `b` int(11) NOT NULL,
2472 `c` int(11) NOT NULL,
2473 PRIMARY KEY (`a`,`b`)
2474-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) (PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = PBXT, PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = PBXT, PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = PBXT) */
2475+) ENGINE=PBXT DEFAULT CHARSET=latin1
2476+/*!50100 PARTITION BY RANGE (a)
2477+(PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = PBXT,
2478+ PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = PBXT,
2479+ PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = PBXT) */
2480 ALTER TABLE t1
2481 partition by range (a)
2482 partitions 3
2483@@ -124,7 +128,11 @@
2484 `b` int(11) NOT NULL,
2485 `c` int(11) NOT NULL,
2486 PRIMARY KEY (`a`,`b`)
2487-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) (PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = PBXT, PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = PBXT, PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = PBXT) */
2488+) ENGINE=PBXT DEFAULT CHARSET=latin1
2489+/*!50100 PARTITION BY RANGE (a)
2490+(PARTITION x1 VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = PBXT,
2491+ PARTITION x2 VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = PBXT,
2492+ PARTITION x3 VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = PBXT) */
2493 drop table if exists t1;
2494 CREATE TABLE t1 (
2495 a int not null,
2496@@ -221,7 +229,15 @@
2497 `b` int(11) NOT NULL,
2498 `c` int(11) NOT NULL,
2499 PRIMARY KEY (`a`,`b`)
2500-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a+b) (PARTITION x1 VALUES LESS THAN (1) (SUBPARTITION x11 ENGINE = PBXT, SUBPARTITION x12 ENGINE = PBXT), PARTITION x2 VALUES LESS THAN (5) (SUBPARTITION x21 ENGINE = PBXT, SUBPARTITION x22 ENGINE = PBXT)) */
2501+) ENGINE=PBXT DEFAULT CHARSET=latin1
2502+/*!50100 PARTITION BY RANGE (a)
2503+SUBPARTITION BY HASH (a+b)
2504+(PARTITION x1 VALUES LESS THAN (1)
2505+ (SUBPARTITION x11 ENGINE = PBXT,
2506+ SUBPARTITION x12 ENGINE = PBXT),
2507+ PARTITION x2 VALUES LESS THAN (5)
2508+ (SUBPARTITION x21 ENGINE = PBXT,
2509+ SUBPARTITION x22 ENGINE = PBXT)) */
2510 ALTER TABLE t1 ADD COLUMN d int;
2511 show create table t1;
2512 Table Create Table
2513@@ -231,7 +247,15 @@
2514 `c` int(11) NOT NULL,
2515 `d` int(11) DEFAULT NULL,
2516 PRIMARY KEY (`a`,`b`)
2517-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a+b) (PARTITION x1 VALUES LESS THAN (1) (SUBPARTITION x11 ENGINE = PBXT, SUBPARTITION x12 ENGINE = PBXT), PARTITION x2 VALUES LESS THAN (5) (SUBPARTITION x21 ENGINE = PBXT, SUBPARTITION x22 ENGINE = PBXT)) */
2518+) ENGINE=PBXT DEFAULT CHARSET=latin1
2519+/*!50100 PARTITION BY RANGE (a)
2520+SUBPARTITION BY HASH (a+b)
2521+(PARTITION x1 VALUES LESS THAN (1)
2522+ (SUBPARTITION x11 ENGINE = PBXT,
2523+ SUBPARTITION x12 ENGINE = PBXT),
2524+ PARTITION x2 VALUES LESS THAN (5)
2525+ (SUBPARTITION x21 ENGINE = PBXT,
2526+ SUBPARTITION x22 ENGINE = PBXT)) */
2527 drop table t1;
2528 CREATE TABLE t1 (
2529 a int not null,
2530@@ -454,7 +478,10 @@
2531 Table Create Table
2532 t1 CREATE TABLE `t1` (
2533 `a` bigint(20) unsigned DEFAULT NULL
2534-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (0) ENGINE = PBXT, PARTITION p1 VALUES LESS THAN (10) ENGINE = PBXT) */
2535+) ENGINE=PBXT DEFAULT CHARSET=latin1
2536+/*!50100 PARTITION BY RANGE (a)
2537+(PARTITION p0 VALUES LESS THAN (0) ENGINE = PBXT,
2538+ PARTITION p1 VALUES LESS THAN (10) ENGINE = PBXT) */
2539 drop table t1;
2540 create table t1 (a bigint unsigned)
2541 partition by range (a)
2542@@ -464,7 +491,10 @@
2543 Table Create Table
2544 t1 CREATE TABLE `t1` (
2545 `a` bigint(20) unsigned DEFAULT NULL
2546-) ENGINE=PBXT DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (2) ENGINE = PBXT, PARTITION p1 VALUES LESS THAN (10) ENGINE = PBXT) */
2547+) ENGINE=PBXT DEFAULT CHARSET=latin1
2548+/*!50100 PARTITION BY RANGE (a)
2549+(PARTITION p0 VALUES LESS THAN (2) ENGINE = PBXT,
2550+ PARTITION p1 VALUES LESS THAN (10) ENGINE = PBXT) */
2551 insert into t1 values (0xFFFFFFFFFFFFFFFF);
2552 ERROR HY000: Table has no partition for value 18446744073709551615
2553 drop table t1;
2554
2555=== modified file 'test/mysql-test/r/preload.result'
2556--- test/mysql-test/r/preload.result 2008-03-10 11:36:34 +0000
2557+++ test/mysql-test/r/preload.result 2009-06-02 20:14:05 +0000
2558@@ -144,7 +144,7 @@
2559 load index into cache t3, t2 key (primary,b) ;
2560 Table Op Msg_type Msg_text
2561 test.t3 preload_keys Error Table 'test.t3' doesn't exist
2562-test.t3 preload_keys error Corrupt
2563+test.t3 preload_keys status Operation failed
2564 test.t2 preload_keys note The storage engine for the table doesn't support preload_keys
2565 show status like "key_read%";
2566 Variable_name Value
2567@@ -159,7 +159,7 @@
2568 load index into cache t3 key (b), t2 key (c) ;
2569 Table Op Msg_type Msg_text
2570 test.t3 preload_keys Error Table 'test.t3' doesn't exist
2571-test.t3 preload_keys error Corrupt
2572+test.t3 preload_keys status Operation failed
2573 test.t2 preload_keys note The storage engine for the table doesn't support preload_keys
2574 show status like "key_read%";
2575 Variable_name Value
2576
2577=== modified file 'test/mysql-test/r/ps.result'
2578--- test/mysql-test/r/ps.result 2008-12-11 01:07:22 +0000
2579+++ test/mysql-test/r/ps.result 2009-06-02 20:19:18 +0000
2580@@ -803,6 +803,8 @@
2581 @@max_prepared_stmt_count
2582 16382
2583 set global max_prepared_stmt_count=-1;
2584+Warnings:
2585+Warning 1292 Truncated incorrect max_prepared_stmt_count value: '-1'
2586 select @@max_prepared_stmt_count;
2587 @@max_prepared_stmt_count
2588 0
2589@@ -1406,7 +1408,7 @@
2590 test.t1 repair note Table does not support optimize, doing recreate + analyze instead
2591 test.t1 repair status OK
2592 test.t4 repair Error Table 'test.t4' doesn't exist
2593-test.t4 repair error Corrupt
2594+test.t4 repair status Operation failed
2595 test.t3 repair note Table does not support optimize, doing recreate + analyze instead
2596 test.t3 repair status OK
2597 execute stmt;
2598@@ -1414,7 +1416,7 @@
2599 test.t1 repair note Table does not support optimize, doing recreate + analyze instead
2600 test.t1 repair status OK
2601 test.t4 repair Error Table 'test.t4' doesn't exist
2602-test.t4 repair error Corrupt
2603+test.t4 repair status Operation failed
2604 test.t3 repair note Table does not support optimize, doing recreate + analyze instead
2605 test.t3 repair status OK
2606 prepare stmt from "optimize table t1, t3, t4";
2607@@ -1425,7 +1427,7 @@
2608 test.t3 optimize note Table does not support optimize, doing recreate + analyze instead
2609 test.t3 optimize status OK
2610 test.t4 optimize Error Table 'test.t4' doesn't exist
2611-test.t4 optimize error Corrupt
2612+test.t4 optimize status Operation failed
2613 execute stmt;
2614 Table Op Msg_type Msg_text
2615 test.t1 optimize note Table does not support optimize, doing recreate + analyze instead
2616@@ -1433,17 +1435,17 @@
2617 test.t3 optimize note Table does not support optimize, doing recreate + analyze instead
2618 test.t3 optimize status OK
2619 test.t4 optimize Error Table 'test.t4' doesn't exist
2620-test.t4 optimize error Corrupt
2621+test.t4 optimize status Operation failed
2622 prepare stmt from "analyze table t4, t1";
2623 execute stmt;
2624 Table Op Msg_type Msg_text
2625 test.t4 analyze Error Table 'test.t4' doesn't exist
2626-test.t4 analyze error Corrupt
2627+test.t4 analyze status Operation failed
2628 test.t1 analyze status OK
2629 execute stmt;
2630 Table Op Msg_type Msg_text
2631 test.t4 analyze Error Table 'test.t4' doesn't exist
2632-test.t4 analyze error Corrupt
2633+test.t4 analyze status Operation failed
2634 test.t1 analyze status OK
2635 deallocate prepare stmt;
2636 drop table t1, t2, t3;
2637
2638=== modified file 'test/mysql-test/r/ps_2myisam.result'
2639--- test/mysql-test/r/ps_2myisam.result 2008-09-17 07:41:28 +0000
2640+++ test/mysql-test/r/ps_2myisam.result 2009-06-02 20:26:05 +0000
2641@@ -1304,11 +1304,12 @@
2642 set @arg00=NULL;
2643 set @arg01=2;
2644 execute stmt1 using @arg00, @arg01;
2645-ERROR 23000: Column 'a' cannot be null
2646+Warnings:
2647+Warning 1048 Column 'a' cannot be null
2648 select a,b from t1 order by a;
2649 a b
2650+0 two
2651 1 one
2652-2 two
2653 3 three
2654 4 four
2655 set @arg00=0;
2656
2657=== modified file 'test/mysql-test/r/ps_4heap.result'
2658--- test/mysql-test/r/ps_4heap.result 2008-09-17 07:41:28 +0000
2659+++ test/mysql-test/r/ps_4heap.result 2009-06-02 20:26:05 +0000
2660@@ -1288,11 +1288,12 @@
2661 set @arg00=NULL;
2662 set @arg01=2;
2663 execute stmt1 using @arg00, @arg01;
2664-ERROR 23000: Column 'a' cannot be null
2665+Warnings:
2666+Warning 1048 Column 'a' cannot be null
2667 select a,b from t1 order by a;
2668 a b
2669+0 two
2670 1 one
2671-2 two
2672 3 three
2673 4 four
2674 set @arg00=0;
2675
2676=== modified file 'test/mysql-test/r/ps_5merge.result'
2677--- test/mysql-test/r/ps_5merge.result 2008-09-17 07:41:28 +0000
2678+++ test/mysql-test/r/ps_5merge.result 2009-06-02 20:26:05 +0000
2679@@ -1330,11 +1330,12 @@
2680 set @arg00=NULL;
2681 set @arg01=2;
2682 execute stmt1 using @arg00, @arg01;
2683-ERROR 23000: Column 'a' cannot be null
2684+Warnings:
2685+Warning 1048 Column 'a' cannot be null
2686 select a,b from t1 order by a;
2687 a b
2688+0 two
2689 1 one
2690-2 two
2691 3 three
2692 4 four
2693 set @arg00=0;
2694@@ -4343,11 +4344,12 @@
2695 set @arg00=NULL;
2696 set @arg01=2;
2697 execute stmt1 using @arg00, @arg01;
2698-ERROR 23000: Column 'a' cannot be null
2699+Warnings:
2700+Warning 1048 Column 'a' cannot be null
2701 select a,b from t1 order by a;
2702 a b
2703+0 two
2704 1 one
2705-2 two
2706 3 three
2707 4 four
2708 set @arg00=0;
2709
2710=== modified file 'test/mysql-test/r/repair.result'
2711--- test/mysql-test/r/repair.result 2009-04-03 19:39:12 +0000
2712+++ test/mysql-test/r/repair.result 2009-06-02 20:26:51 +0000
2713@@ -27,7 +27,7 @@
2714 repair table t1 use_frm;
2715 Table Op Msg_type Msg_text
2716 test.t1 repair Error Table 'test.t1' doesn't exist
2717-test.t1 repair error Corrupt
2718+test.t1 repair status Operation failed
2719 create table t1 engine=myisam SELECT 1,"table 1";
2720 flush tables;
2721 repair table t1;
2722
2723=== modified file 'test/mysql-test/r/schema.result'
2724--- test/mysql-test/r/schema.result 2008-03-28 09:30:34 +0000
2725+++ test/mysql-test/r/schema.result 2009-06-02 22:12:20 +0000
2726@@ -3,6 +3,7 @@
2727 show create schema foo;
2728 Database Create Database
2729 foo CREATE DATABASE `foo` /*!40100 DEFAULT CHARACTER SET latin1 */
2730+create table t1 (id int) engine=pbxt;
2731 show schemas;
2732 Database
2733 information_schema
2734
2735=== modified file 'test/mysql-test/r/select.result'
2736--- test/mysql-test/r/select.result 2009-04-03 19:39:12 +0000
2737+++ test/mysql-test/r/select.result 2009-06-02 20:38:55 +0000
2738@@ -2792,26 +2792,26 @@
2739 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
2740 select max(key1) from t1 where key1 <= 0.6158;
2741 max(key1)
2742-0.61580002307892
2743+0.615800023078918
2744 select max(key2) from t2 where key2 <= 1.6158;
2745 max(key2)
2746-1.6158000230789
2747+1.61580002307892
2748 select min(key1) from t1 where key1 >= 0.3762;
2749 min(key1)
2750-0.37619999051094
2751+0.376199990510941
2752 select min(key2) from t2 where key2 >= 1.3762;
2753 min(key2)
2754-1.3761999607086
2755+1.37619996070862
2756 select max(key1), min(key2) from t1, t2
2757 where key1 <= 0.6158 and key2 >= 1.3762;
2758 max(key1) min(key2)
2759-0.61580002307892 1.3761999607086
2760+0.615800023078918 1.37619996070862
2761 select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5;
2762 max(key1)
2763-0.61580002307892
2764+0.615800023078918
2765 select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;
2766 min(key1)
2767-0.37619999051094
2768+0.376199990510941
2769 DROP TABLE t1,t2;
2770 CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL);
2771 INSERT INTO t1 VALUES (10);
2772
2773=== modified file 'test/mysql-test/r/sp.result'
2774--- test/mysql-test/r/sp.result 2008-10-01 07:54:39 +0000
2775+++ test/mysql-test/r/sp.result 2009-06-02 20:41:49 +0000
2776@@ -577,7 +577,7 @@
2777 set @e = e()|
2778 select e(), @e|
2779 e() @e
2780-2.718281828459 2.718281828459
2781+2.71828182845905 2.71828182845905
2782 drop function if exists inc|
2783 create function inc(i int) returns int
2784 return i+1|
2785@@ -614,7 +614,7 @@
2786 return mul(inc(i), fac(u)) / e()|
2787 select fun(2.3, 3, 5)|
2788 fun(2.3, 3, 5)
2789-176.58213176229
2790+176.582131762292
2791 insert into t2 values (append("xxx", "yyy"), mul(4,3), e())|
2792 insert into t2 values (append("a", "b"), mul(2,mul(3,4)), fun(1.7, 4, 6))|
2793 select * from t2 where s = append("a", "b")|
2794@@ -2472,7 +2472,7 @@
2795 Alter Tables To alter the table
2796 Alter routine Functions,Procedures To alter or drop stored functions/procedures
2797 Create Databases,Tables,Indexes To create new databases and tables
2798-Create routine Functions,Procedures To use CREATE FUNCTION/PROCEDURE
2799+Create routine Databases To use CREATE FUNCTION/PROCEDURE
2800 Create temporary tables Databases To use CREATE TEMPORARY TABLE
2801 Create view Tables To create new views
2802 Create user Server Admin To create new users
2803@@ -2526,7 +2526,7 @@
2804 Alter Tables To alter the table
2805 Alter routine Functions,Procedures To alter or drop stored functions/procedures
2806 Create Databases,Tables,Indexes To create new databases and tables
2807-Create routine Functions,Procedures To use CREATE FUNCTION/PROCEDURE
2808+Create routine Databases To use CREATE FUNCTION/PROCEDURE
2809 Create temporary tables Databases To use CREATE TEMPORARY TABLE
2810 Create view Tables To create new views
2811 Create user Server Admin To create new users
2812@@ -4406,10 +4406,10 @@
2813 Table Op Msg_type Msg_text
2814 test.t1 repair status OK
2815 Table Op Msg_type Msg_text
2816-test.t1 backup Warning The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead
2817+test.t1 backup Warning The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
2818 test.t1 backup status OK
2819 Table Op Msg_type Msg_text
2820-test.t1 restore Warning The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead
2821+test.t1 restore Warning The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 6.0. Please use MySQL Administrator (mysqldump, mysql) instead
2822 test.t1 restore status OK
2823 drop procedure bug13012|
2824 create view v1 as select * from t1|
2825
2826=== modified file 'test/mysql-test/r/symlink.result'
2827--- test/mysql-test/r/symlink.result 2008-06-09 12:49:32 +0000
2828+++ test/mysql-test/r/symlink.result 2009-06-02 20:43:23 +0000
2829@@ -83,7 +83,7 @@
2830 create table t1 (a int not null) engine=myisam;
2831 alter table t1 data directory="MYSQLTEST_VARDIR/tmp";
2832 Warnings:
2833-Warning 0 DATA DIRECTORY option ignored
2834+Warning 1618 <DATA DIRECTORY> option ignored
2835 show create table t1;
2836 Table Create Table
2837 t1 CREATE TABLE `t1` (
2838@@ -92,7 +92,7 @@
2839 alter table t1 add b int;
2840 alter table t1 data directory="MYSQLTEST_VARDIR/log";
2841 Warnings:
2842-Warning 0 DATA DIRECTORY option ignored
2843+Warning 1618 <DATA DIRECTORY> option ignored
2844 show create table t1;
2845 Table Create Table
2846 t1 CREATE TABLE `t1` (
2847@@ -101,7 +101,7 @@
2848 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
2849 alter table t1 index directory="MYSQLTEST_VARDIR/log";
2850 Warnings:
2851-Warning 0 INDEX DIRECTORY option ignored
2852+Warning 1618 <INDEX DIRECTORY> option ignored
2853 show create table t1;
2854 Table Create Table
2855 t1 CREATE TABLE `t1` (
2856@@ -168,8 +168,8 @@
2857 SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE='NO_DIR_IN_CREATE';
2858 CREATE TABLE t1(a INT) DATA DIRECTORY='MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY='MYSQLTEST_VARDIR/tmp';
2859 Warnings:
2860-Warning 0 DATA DIRECTORY option ignored
2861-Warning 0 INDEX DIRECTORY option ignored
2862+Warning 1618 <DATA DIRECTORY> option ignored
2863+Warning 1618 <INDEX DIRECTORY> option ignored
2864 DROP TABLE t1;
2865 SET @@SQL_MODE=@OLD_SQL_MODE;
2866 End of 5.1 tests
2867
2868=== modified file 'test/mysql-test/r/timezone2.result'
2869--- test/mysql-test/r/timezone2.result 2007-01-29 15:04:29 +0000
2870+++ test/mysql-test/r/timezone2.result 2009-06-02 20:45:58 +0000
2871@@ -110,7 +110,7 @@
2872 362793610 1981-07-01 04:00:00
2873 select from_unixtime(362793609);
2874 from_unixtime(362793609)
2875-1981-07-01 03:59:60
2876+1981-07-01 03:59:59
2877 drop table t1;
2878 create table t1 (ts timestamp);
2879 set time_zone='UTC';
2880
2881=== modified file 'test/mysql-test/r/type_timestamp.result'
2882--- test/mysql-test/r/type_timestamp.result 2008-03-11 16:31:13 +0000
2883+++ test/mysql-test/r/type_timestamp.result 2009-06-02 20:47:35 +0000
2884@@ -101,13 +101,13 @@
2885 t8 timestamp(8), t10 timestamp(10), t12 timestamp(12),
2886 t14 timestamp(14));
2887 Warnings:
2888-Warning 1287 The syntax 'TIMESTAMP(2)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
2889-Warning 1287 The syntax 'TIMESTAMP(4)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
2890-Warning 1287 The syntax 'TIMESTAMP(6)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
2891-Warning 1287 The syntax 'TIMESTAMP(8)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
2892-Warning 1287 The syntax 'TIMESTAMP(10)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
2893-Warning 1287 The syntax 'TIMESTAMP(12)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
2894-Warning 1287 The syntax 'TIMESTAMP(14)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead
2895+Warning 1287 The syntax 'TIMESTAMP(2)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
2896+Warning 1287 The syntax 'TIMESTAMP(4)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
2897+Warning 1287 The syntax 'TIMESTAMP(6)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
2898+Warning 1287 The syntax 'TIMESTAMP(8)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
2899+Warning 1287 The syntax 'TIMESTAMP(10)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
2900+Warning 1287 The syntax 'TIMESTAMP(12)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
2901+Warning 1287 The syntax 'TIMESTAMP(14)' is deprecated and will be removed in MySQL 6.0. Please use 'TIMESTAMP' instead
2902 insert t1 values (0,0,0,0,0,0,0),
2903 ("1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",
2904 "1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",
2905
2906=== modified file 'test/mysql-test/r/union.result'
2907--- test/mysql-test/r/union.result 2008-12-11 01:07:22 +0000
2908+++ test/mysql-test/r/union.result 2009-06-02 20:52:31 +0000
2909@@ -1301,10 +1301,10 @@
2910 `left(a,100000000)` longtext
2911 ) ENGINE=PBXT DEFAULT CHARSET=latin1
2912 drop tables t1,t2,t3;
2913-SELECT @tmp_max:= @@max_allowed_packet;
2914-@tmp_max:= @@max_allowed_packet
2915+SELECT @tmp_max:= @@global.max_allowed_packet;
2916+@tmp_max:= @@global.max_allowed_packet
2917 1048576
2918-SET max_allowed_packet=25000000;
2919+SET @@global.max_allowed_packet=25000000;
2920 CREATE TABLE t1 (a mediumtext);
2921 CREATE TABLE t2 (b varchar(20));
2922 INSERT INTO t1 VALUES ('a');
2923@@ -1342,7 +1342,7 @@
2924 `a` varbinary(510) DEFAULT NULL
2925 ) ENGINE=PBXT DEFAULT CHARSET=latin1
2926 DROP TABLES t1,t2,t3;
2927-SET max_allowed_packet:= @tmp_max;
2928+SET @@global.max_allowed_packet:= @tmp_max;
2929 create table t1 ( id int not null auto_increment, primary key (id), col1 int);
2930 insert into t1 (col1) values (2),(3),(4),(5),(6);
2931 select 99 union all select id from t1 order by 1;
2932
2933=== modified file 'test/mysql-test/r/user_var-binlog.result'
2934--- test/mysql-test/r/user_var-binlog.result 2008-11-05 15:56:49 +0000
2935+++ test/mysql-test/r/user_var-binlog.result 2009-06-02 21:26:33 +0000
2936@@ -24,7 +24,7 @@
2937 use test/*!*/;
2938 SET TIMESTAMP=10000/*!*/;
2939 SET @@session.pseudo_thread_id=999999999/*!*/;
2940-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;
2941+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
2942 SET @@session.sql_mode=0/*!*/;
2943 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
2944 /*!\C latin1 *//*!*/;
2945
2946=== modified file 'test/mysql-test/r/varbinary.result'
2947--- test/mysql-test/r/varbinary.result 2008-03-10 11:36:34 +0000
2948+++ test/mysql-test/r/varbinary.result 2009-06-02 21:27:45 +0000
2949@@ -38,7 +38,7 @@
2950 255 3
2951 CHECK TABLE t1 FOR UPGRADE;
2952 Table Op Msg_type Msg_text
2953-test.t1 check error Table upgrade required. Please do "REPAIR TABLE `t1`" to fix it!
2954+test.t1 check error Table upgrade required. Please do "REPAIR TABLE `t1`" or dump/reload to fix it!
2955 REPAIR TABLE t1;
2956 Table Op Msg_type Msg_text
2957 test.t1 repair status OK
2958
2959=== modified file 'test/mysql-test/r/variables.result'
2960--- test/mysql-test/r/variables.result 2008-11-01 14:40:10 +0000
2961+++ test/mysql-test/r/variables.result 2009-06-02 21:30:51 +0000
2962@@ -9,13 +9,13 @@
2963 set @my_max_binlog_cache_size =@@global.max_binlog_cache_size;
2964 set @my_max_binlog_size =@@global.max_binlog_size;
2965 set @my_max_connect_errors =@@global.max_connect_errors;
2966+set @my_max_connections =@@global.max_connections;
2967 set @my_max_delayed_threads =@@global.max_delayed_threads;
2968 set @my_max_heap_table_size =@@global.max_heap_table_size;
2969 set @my_max_insert_delayed_threads=@@global.max_insert_delayed_threads;
2970 set @my_max_join_size =@@global.max_join_size;
2971-set @my_max_user_connections =@@global.max_user_connections;
2972-set @my_max_write_lock_count =@@global.max_write_lock_count;
2973 set @my_myisam_data_pointer_size =@@global.myisam_data_pointer_size;
2974+set @my_myisam_max_sort_file_size =@@global.myisam_max_sort_file_size;
2975 set @my_net_buffer_length =@@global.net_buffer_length;
2976 set @my_net_write_timeout =@@global.net_write_timeout;
2977 set @my_net_read_timeout =@@global.net_read_timeout;
2978@@ -26,6 +26,8 @@
2979 set @my_slow_launch_time =@@global.slow_launch_time;
2980 set @my_storage_engine =@@global.storage_engine;
2981 set @my_thread_cache_size =@@global.thread_cache_size;
2982+set @my_max_allowed_packet =@@global.max_allowed_packet;
2983+set @my_join_buffer_size =@@global.join_buffer_size;
2984 set @`test`=1;
2985 select @test, @`test`, @TEST, @`TEST`, @"teSt";
2986 @test @`test` @TEST @`TEST` @"teSt"
2987@@ -158,7 +160,7 @@
2988 id select_type table type possible_keys key key_len ref rows filtered Extra
2989 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
2990 Warnings:
2991-Note 1003 select 345 AS `@@IDENTITY`,last_insert_id() AS `last_insert_id()`,345 AS `@@identity`
2992+Note 1003 select @@IDENTITY AS `@@IDENTITY`,last_insert_id() AS `last_insert_id()`,@@identity AS `@@identity`
2993 set big_tables=OFF, big_tables=ON, big_tables=0, big_tables=1, big_tables="OFF", big_tables="ON";
2994 set global concurrent_insert=2;
2995 show variables like 'concurrent_insert';
2996@@ -221,22 +223,21 @@
2997 VARIABLE_NAME VARIABLE_VALUE
2998 MYISAM_MAX_SORT_FILE_SIZE 1048576
2999 set GLOBAL myisam_max_sort_file_size=default;
3000-show variables like 'myisam_max_sort_file_size';
3001+show global variables like 'myisam_max_sort_file_size';
3002 Variable_name Value
3003 myisam_max_sort_file_size FILE_SIZE
3004-select * from information_schema.session_variables where variable_name like 'myisam_max_sort_file_size';
3005+select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size';
3006 VARIABLE_NAME VARIABLE_VALUE
3007 MYISAM_MAX_SORT_FILE_SIZE FILE_SIZE
3008 set global net_retry_count=10, session net_retry_count=10;
3009 set global net_buffer_length=1024, net_write_timeout=200, net_read_timeout=300;
3010-set session net_buffer_length=2048, net_write_timeout=500, net_read_timeout=600;
3011 show global variables like 'net_%';
3012 Variable_name Value
3013 net_buffer_length 1024
3014 net_read_timeout 300
3015 net_retry_count 10
3016 net_write_timeout 200
3017-select * from information_schema.global_variables where variable_name like 'net_%' order by variable_name;
3018+select * from information_schema.global_variables where variable_name like 'net_%' order by 1;
3019 VARIABLE_NAME VARIABLE_VALUE
3020 NET_BUFFER_LENGTH 1024
3021 NET_READ_TIMEOUT 300
3022@@ -244,57 +245,45 @@
3023 NET_WRITE_TIMEOUT 200
3024 show session variables like 'net_%';
3025 Variable_name Value
3026-net_buffer_length 2048
3027-net_read_timeout 600
3028+net_buffer_length 16384
3029+net_read_timeout 30
3030 net_retry_count 10
3031-net_write_timeout 500
3032-select * from information_schema.session_variables where variable_name like 'net_%' order by variable_name;
3033+net_write_timeout 60
3034+select * from information_schema.session_variables where variable_name like 'net_%' order by 1;
3035 VARIABLE_NAME VARIABLE_VALUE
3036-NET_BUFFER_LENGTH 2048
3037-NET_READ_TIMEOUT 600
3038+NET_BUFFER_LENGTH 16384
3039+NET_READ_TIMEOUT 30
3040 NET_RETRY_COUNT 10
3041-NET_WRITE_TIMEOUT 500
3042-set session net_buffer_length=8000, global net_read_timeout=900, net_write_timeout=1000;
3043+NET_WRITE_TIMEOUT 60
3044+set global net_buffer_length=8000, global net_read_timeout=900, net_write_timeout=1000;
3045 show global variables like 'net_%';
3046 Variable_name Value
3047-net_buffer_length 1024
3048+net_buffer_length 7168
3049 net_read_timeout 900
3050 net_retry_count 10
3051 net_write_timeout 1000
3052-select * from information_schema.global_variables where variable_name like 'net_%' order by variable_name;
3053+select * from information_schema.global_variables where variable_name like 'net_%' order by 1;
3054 VARIABLE_NAME VARIABLE_VALUE
3055-NET_BUFFER_LENGTH 1024
3056+NET_BUFFER_LENGTH 7168
3057 NET_READ_TIMEOUT 900
3058 NET_RETRY_COUNT 10
3059 NET_WRITE_TIMEOUT 1000
3060-show session variables like 'net_%';
3061-Variable_name Value
3062-net_buffer_length 7168
3063-net_read_timeout 600
3064-net_retry_count 10
3065-net_write_timeout 500
3066-select * from information_schema.session_variables where variable_name like 'net_%' order by variable_name;
3067-VARIABLE_NAME VARIABLE_VALUE
3068-NET_BUFFER_LENGTH 7168
3069-NET_READ_TIMEOUT 600
3070-NET_RETRY_COUNT 10
3071-NET_WRITE_TIMEOUT 500
3072-set net_buffer_length=1;
3073+set global net_buffer_length=1;
3074 Warnings:
3075 Warning 1292 Truncated incorrect net_buffer_length value: '1'
3076-show variables like 'net_buffer_length';
3077+show global variables like 'net_buffer_length';
3078 Variable_name Value
3079 net_buffer_length 1024
3080-select * from information_schema.session_variables where variable_name like 'net_buffer_length';
3081+select * from information_schema.global_variables where variable_name like 'net_buffer_length';
3082 VARIABLE_NAME VARIABLE_VALUE
3083 NET_BUFFER_LENGTH 1024
3084-set net_buffer_length=2000000000;
3085+set global net_buffer_length=2000000000;
3086 Warnings:
3087 Warning 1292 Truncated incorrect net_buffer_length value: '2000000000'
3088-show variables like 'net_buffer_length';
3089+show global variables like 'net_buffer_length';
3090 Variable_name Value
3091 net_buffer_length 1048576
3092-select * from information_schema.session_variables where variable_name like 'net_buffer_length';
3093+select * from information_schema.global_variables where variable_name like 'net_buffer_length';
3094 VARIABLE_NAME VARIABLE_VALUE
3095 NET_BUFFER_LENGTH 1048576
3096 set character set cp1251_koi8;
3097@@ -311,59 +300,107 @@
3098 select ROUND(RAND(),5);
3099 ROUND(RAND(),5)
3100 0.02887
3101-show variables like '%alloc%';
3102+
3103+==+ Testing %alloc% system variables +==
3104+==+ NOTE: These values *must* be a multiple of 1024 +==
3105+==+ Other values will be rounded down to nearest multiple +==
3106+
3107+==+ Show initial values +==
3108+SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
3109+'query_alloc_block_size', 'query_prealloc_size',
3110+'transaction_alloc_block_size', 'transaction_prealloc_size');
3111 Variable_name Value
3112 query_alloc_block_size 8192
3113 query_prealloc_size 8192
3114 range_alloc_block_size 4096
3115 transaction_alloc_block_size 8192
3116 transaction_prealloc_size 4096
3117-select * from information_schema.session_variables where variable_name like '%alloc%' order by variable_name;
3118+==+ information_schema data +==
3119+SELECT * FROM information_schema.session_variables
3120+WHERE variable_name IN ('range_alloc_block_size',
3121+'query_alloc_block_size', 'query_prealloc_size',
3122+'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1;
3123 VARIABLE_NAME VARIABLE_VALUE
3124 QUERY_ALLOC_BLOCK_SIZE 8192
3125 QUERY_PREALLOC_SIZE 8192
3126 RANGE_ALLOC_BLOCK_SIZE 4096
3127 TRANSACTION_ALLOC_BLOCK_SIZE 8192
3128 TRANSACTION_PREALLOC_SIZE 4096
3129-set @@range_alloc_block_size=1024*16;
3130+Testing values that are multiples of 1024
3131+set @@range_alloc_block_size=1024*15+1024;
3132+set @@query_alloc_block_size=1024*15+1024*2;
3133+set @@query_prealloc_size=1024*18-1024;
3134+set @@transaction_alloc_block_size=1024*21-1024*1;
3135+set @@transaction_prealloc_size=1024*21-2048;
3136+==+ Check manipulated values ==+
3137+select @@query_alloc_block_size;
3138+@@query_alloc_block_size
3139+17408
3140+SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
3141+'query_alloc_block_size', 'query_prealloc_size',
3142+'transaction_alloc_block_size', 'transaction_prealloc_size');
3143+Variable_name Value
3144+query_alloc_block_size 17408
3145+query_prealloc_size 17408
3146+range_alloc_block_size 16384
3147+transaction_alloc_block_size 20480
3148+transaction_prealloc_size 19456
3149+==+ information_schema data +==
3150+SELECT * FROM information_schema.session_variables
3151+WHERE variable_name IN ('range_alloc_block_size',
3152+'query_alloc_block_size', 'query_prealloc_size',
3153+'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1;
3154+VARIABLE_NAME VARIABLE_VALUE
3155+QUERY_ALLOC_BLOCK_SIZE 17408
3156+QUERY_PREALLOC_SIZE 17408
3157+RANGE_ALLOC_BLOCK_SIZE 16384
3158+TRANSACTION_ALLOC_BLOCK_SIZE 20480
3159+TRANSACTION_PREALLOC_SIZE 19456
3160+==+ Manipulate variable values +==
3161+Testing values that are not 1024 multiples
3162+set @@range_alloc_block_size=1024*16+1023;
3163 set @@query_alloc_block_size=1024*17+2;
3164-set @@query_prealloc_size=1024*18;
3165+set @@query_prealloc_size=1024*18-1023;
3166 set @@transaction_alloc_block_size=1024*20-1;
3167 set @@transaction_prealloc_size=1024*21-1;
3168 select @@query_alloc_block_size;
3169 @@query_alloc_block_size
3170 17408
3171-show variables like '%alloc%';
3172+==+ Check manipulated values ==+
3173+SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
3174+'query_alloc_block_size', 'query_prealloc_size',
3175+'transaction_alloc_block_size', 'transaction_prealloc_size');
3176 Variable_name Value
3177 query_alloc_block_size 17408
3178-query_prealloc_size 18432
3179+query_prealloc_size 17408
3180 range_alloc_block_size 16384
3181 transaction_alloc_block_size 19456
3182 transaction_prealloc_size 20480
3183-select * from information_schema.session_variables where variable_name like '%alloc%' order by variable_name;
3184+==+ information_schema data +==
3185+SELECT * FROM information_schema.session_variables
3186+WHERE variable_name IN ('range_alloc_block_size',
3187+'query_alloc_block_size', 'query_prealloc_size',
3188+'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1;
3189 VARIABLE_NAME VARIABLE_VALUE
3190 QUERY_ALLOC_BLOCK_SIZE 17408
3191-QUERY_PREALLOC_SIZE 18432
3192+QUERY_PREALLOC_SIZE 17408
3193 RANGE_ALLOC_BLOCK_SIZE 16384
3194 TRANSACTION_ALLOC_BLOCK_SIZE 19456
3195 TRANSACTION_PREALLOC_SIZE 20480
3196+==+ Set values back to the default values +==
3197 set @@range_alloc_block_size=default;
3198 set @@query_alloc_block_size=default, @@query_prealloc_size=default;
3199 set transaction_alloc_block_size=default, @@transaction_prealloc_size=default;
3200-show variables like '%alloc%';
3201+==+ Check the values now that they are reset +==
3202+SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
3203+'query_alloc_block_size', 'query_prealloc_size',
3204+'transaction_alloc_block_size', 'transaction_prealloc_size');
3205 Variable_name Value
3206 query_alloc_block_size 8192
3207 query_prealloc_size 8192
3208 range_alloc_block_size 4096
3209 transaction_alloc_block_size 8192
3210 transaction_prealloc_size 4096
3211-select * from information_schema.session_variables where variable_name like '%alloc%' order by variable_name;
3212-VARIABLE_NAME VARIABLE_VALUE
3213-QUERY_ALLOC_BLOCK_SIZE 8192
3214-QUERY_PREALLOC_SIZE 8192
3215-RANGE_ALLOC_BLOCK_SIZE 4096
3216-TRANSACTION_ALLOC_BLOCK_SIZE 8192
3217-TRANSACTION_PREALLOC_SIZE 4096
3218 SELECT @@version LIKE 'non-existent';
3219 @@version LIKE 'non-existent'
3220 0
3221@@ -453,9 +490,16 @@
3222 Warning 1292 Truncated incorrect join_buffer_size value: '100'
3223 set last_insert_id=1;
3224 set global local_infile=1;
3225-set long_query_time=100;
3226+set long_query_time=0.000001;
3227+select @@long_query_time;
3228+@@long_query_time
3229+0.000001
3230+set long_query_time=100.000001;
3231+select @@long_query_time;
3232+@@long_query_time
3233+100.000001
3234 set low_priority_updates=1;
3235-set max_allowed_packet=100;
3236+set global max_allowed_packet=100;
3237 Warnings:
3238 Warning 1292 Truncated incorrect max_allowed_packet value: '100'
3239 set global max_binlog_cache_size=100;
3240@@ -479,7 +523,7 @@
3241 100
3242 set global max_write_lock_count=100;
3243 set myisam_sort_buffer_size=100;
3244-set net_buffer_length=100;
3245+set global net_buffer_length=100;
3246 Warnings:
3247 Warning 1292 Truncated incorrect net_buffer_length value: '100'
3248 set net_read_timeout=100;
3249@@ -543,6 +587,7 @@
3250 set tx_isolation="READ-COMMITTED";
3251 set wait_timeout=100;
3252 set log_warnings=1;
3253+set global log_warnings=1;
3254 select @@session.insert_id;
3255 @@session.insert_id
3256 1
3257@@ -709,7 +754,7 @@
3258 MYISAM_DATA_POINTER_SIZE 7
3259 SET GLOBAL table_open_cache=-1;
3260 Warnings:
3261-Warning 1292 Truncated incorrect table_open_cache value: '0'
3262+Warning 1292 Truncated incorrect table_open_cache value: '-1'
3263 SHOW VARIABLES LIKE 'table_open_cache';
3264 Variable_name Value
3265 table_open_cache 1
3266@@ -782,11 +827,45 @@
3267 select @@lc_time_names;
3268 @@lc_time_names
3269 en_US
3270+select @@global.lc_time_names, @@lc_time_names;
3271+@@global.lc_time_names @@lc_time_names
3272+en_US en_US
3273+set @@global.lc_time_names=fr_FR;
3274+select @@global.lc_time_names, @@lc_time_names;
3275+@@global.lc_time_names @@lc_time_names
3276+fr_FR en_US
3277+New connection
3278+select @@global.lc_time_names, @@lc_time_names;
3279+@@global.lc_time_names @@lc_time_names
3280+fr_FR fr_FR
3281+set @@lc_time_names=ru_RU;
3282+select @@global.lc_time_names, @@lc_time_names;
3283+@@global.lc_time_names @@lc_time_names
3284+fr_FR ru_RU
3285+Returnung to default connection
3286+select @@global.lc_time_names, @@lc_time_names;
3287+@@global.lc_time_names @@lc_time_names
3288+fr_FR en_US
3289+set lc_time_names=default;
3290+select @@global.lc_time_names, @@lc_time_names;
3291+@@global.lc_time_names @@lc_time_names
3292+fr_FR fr_FR
3293+set @@global.lc_time_names=default;
3294+select @@global.lc_time_names, @@lc_time_names;
3295+@@global.lc_time_names @@lc_time_names
3296+en_US fr_FR
3297+set @@lc_time_names=default;
3298+select @@global.lc_time_names, @@lc_time_names;
3299+@@global.lc_time_names @@lc_time_names
3300+en_US en_US
3301 set @test = @@query_prealloc_size;
3302 set @@query_prealloc_size = @test;
3303 select @@query_prealloc_size = @test;
3304 @@query_prealloc_size = @test
3305 1
3306+set global sql_mode=repeat('a',80);
3307+ERROR 42000: Variable 'sql_mode' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
3308+End of 4.1 tests
3309 create table t1 (a int);
3310 select a into @x from t1;
3311 Warnings:
3312@@ -909,7 +988,7 @@
3313 ssl_cert #
3314 ssl_cipher #
3315 ssl_key #
3316-select * from information_schema.session_variables where variable_name like 'ssl%' order by variable_name;
3317+select * from information_schema.session_variables where variable_name like 'ssl%' order by 1;
3318 VARIABLE_NAME VARIABLE_VALUE
3319 SSL_CA #
3320 SSL_CAPATH #
3321@@ -931,7 +1010,20 @@
3322 ERROR 42000: 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 '&' at line 1
3323 select @@@;
3324 ERROR 42000: 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 '@' at line 1
3325+select @@hostname;
3326+@@hostname
3327+#
3328+set @@hostname= "anothername";
3329+ERROR HY000: Variable 'hostname' is a read only variable
3330+show variables like 'hostname';
3331+Variable_name Value
3332+hostname #
3333 End of 5.0 tests
3334+set join_buffer_size=1;
3335+Warnings:
3336+Warning 1292 Truncated incorrect join_buffer_size value: '1'
3337+set @save_join_buffer_size=@@join_buffer_size;
3338+set join_buffer_size=@save_join_buffer_size;
3339 set global binlog_cache_size =@my_binlog_cache_size;
3340 set global connect_timeout =@my_connect_timeout;
3341 set global delayed_insert_timeout =@my_delayed_insert_timeout;
3342@@ -939,16 +1031,18 @@
3343 set global flush =@my_flush;
3344 set global flush_time =@my_flush_time;
3345 set global key_buffer_size =@my_key_buffer_size;
3346-set global max_binlog_cache_size =default;
3347+set global max_binlog_cache_size =@my_max_binlog_cache_size;
3348 set global max_binlog_size =@my_max_binlog_size;
3349 set global max_connect_errors =@my_max_connect_errors;
3350+set global max_connections =@my_max_connections;
3351 set global max_delayed_threads =@my_max_delayed_threads;
3352 set global max_heap_table_size =@my_max_heap_table_size;
3353 set global max_insert_delayed_threads=@my_max_insert_delayed_threads;
3354 set global max_join_size =@my_max_join_size;
3355-set global max_user_connections =@my_max_user_connections;
3356-set global max_write_lock_count =@my_max_write_lock_count;
3357+set global max_user_connections =default;
3358+set global max_write_lock_count =default;
3359 set global myisam_data_pointer_size =@my_myisam_data_pointer_size;
3360+set global myisam_max_sort_file_size =@my_myisam_max_sort_file_size;
3361 set global net_buffer_length =@my_net_buffer_length;
3362 set global net_write_timeout =@my_net_write_timeout;
3363 set global net_read_timeout =@my_net_read_timeout;
3364@@ -959,3 +1053,418 @@
3365 set global slow_launch_time =@my_slow_launch_time;
3366 set global storage_engine =@my_storage_engine;
3367 set global thread_cache_size =@my_thread_cache_size;
3368+set global max_allowed_packet =@my_max_allowed_packet;
3369+set global join_buffer_size =@my_join_buffer_size;
3370+show global variables where Variable_name='table_definition_cache' or
3371+Variable_name='table_lock_wait_timeout';
3372+Variable_name Value
3373+table_definition_cache #
3374+table_lock_wait_timeout #
3375+
3376+# --
3377+# -- Bug#34820: log_output can be set to illegal value.
3378+# --
3379+SET GLOBAL log_output = '';
3380+ERROR 42000: Variable 'log_output' can't be set to the value of ''
3381+SET GLOBAL log_output = 0;
3382+ERROR 42000: Variable 'log_output' can't be set to the value of '0'
3383+
3384+# -- End of Bug#34820.
3385+
3386+#
3387+SHOW VARIABLES like 'ft_max_word_len';
3388+Variable_name Value
3389+ft_max_word_len 84
3390+SELECT @@session.ft_max_word_len;
3391+ERROR HY000: Variable 'ft_max_word_len' is a GLOBAL variable
3392+SELECT @@global.ft_max_word_len;
3393+@@global.ft_max_word_len
3394+84
3395+SET @@session.ft_max_word_len= 7;
3396+ERROR HY000: Variable 'ft_max_word_len' is a read only variable
3397+SET @@global.ft_max_word_len= 7;
3398+ERROR HY000: Variable 'ft_max_word_len' is a read only variable
3399+#
3400+SHOW VARIABLES like 'ft_min_word_len';
3401+Variable_name Value
3402+ft_min_word_len 4
3403+SELECT @@session.ft_min_word_len;
3404+ERROR HY000: Variable 'ft_min_word_len' is a GLOBAL variable
3405+SELECT @@global.ft_min_word_len;
3406+@@global.ft_min_word_len
3407+4
3408+SET @@session.ft_min_word_len= 7;
3409+ERROR HY000: Variable 'ft_min_word_len' is a read only variable
3410+SET @@global.ft_min_word_len= 7;
3411+ERROR HY000: Variable 'ft_min_word_len' is a read only variable
3412+#
3413+SHOW VARIABLES like 'ft_query_expansion_limit';
3414+Variable_name Value
3415+ft_query_expansion_limit 20
3416+SELECT @@session.ft_query_expansion_limit;
3417+ERROR HY000: Variable 'ft_query_expansion_limit' is a GLOBAL variable
3418+SELECT @@global.ft_query_expansion_limit;
3419+@@global.ft_query_expansion_limit
3420+20
3421+SET @@session.ft_query_expansion_limit= 7;
3422+ERROR HY000: Variable 'ft_query_expansion_limit' is a read only variable
3423+SET @@global.ft_query_expansion_limit= 7;
3424+ERROR HY000: Variable 'ft_query_expansion_limit' is a read only variable
3425+#
3426+SHOW VARIABLES like 'ft_stopword_file';
3427+Variable_name Value
3428+ft_stopword_file (built-in)
3429+SELECT @@session.ft_stopword_file;
3430+ERROR HY000: Variable 'ft_stopword_file' is a GLOBAL variable
3431+SELECT @@global.ft_stopword_file;
3432+@@global.ft_stopword_file
3433+(built-in)
3434+SET @@session.ft_stopword_file= 'x';
3435+ERROR HY000: Variable 'ft_stopword_file' is a read only variable
3436+SET @@global.ft_stopword_file= 'x';
3437+ERROR HY000: Variable 'ft_stopword_file' is a read only variable
3438+#
3439+SHOW VARIABLES like 'back_log';
3440+Variable_name Value
3441+back_log 50
3442+SELECT @@session.back_log;
3443+ERROR HY000: Variable 'back_log' is a GLOBAL variable
3444+SELECT @@global.back_log;
3445+@@global.back_log
3446+50
3447+SET @@session.back_log= 7;
3448+ERROR HY000: Variable 'back_log' is a read only variable
3449+SET @@global.back_log= 7;
3450+ERROR HY000: Variable 'back_log' is a read only variable
3451+#
3452+SHOW VARIABLES like 'large_files_support';
3453+Variable_name Value
3454+large_files_support #
3455+SELECT @@session.large_files_support;
3456+ERROR HY000: Variable 'large_files_support' is a GLOBAL variable
3457+SELECT @@global.large_files_support;
3458+@@global.large_files_support
3459+#
3460+SET @@session.large_files_support= true;
3461+ERROR HY000: Variable 'large_files_support' is a read only variable
3462+SET @@global.large_files_support= true;
3463+ERROR HY000: Variable 'large_files_support' is a read only variable
3464+#
3465+SHOW VARIABLES like 'character_sets_dir';
3466+Variable_name Value
3467+character_sets_dir #
3468+SELECT @@session.character_sets_dir;
3469+ERROR HY000: Variable 'character_sets_dir' is a GLOBAL variable
3470+SELECT @@global.character_sets_dir;
3471+@@global.character_sets_dir
3472+#
3473+SET @@session.character_sets_dir= 'x';
3474+ERROR HY000: Variable 'character_sets_dir' is a read only variable
3475+SET @@global.character_sets_dir= 'x';
3476+ERROR HY000: Variable 'character_sets_dir' is a read only variable
3477+#
3478+SHOW VARIABLES like 'init_file';
3479+Variable_name Value
3480+init_file #
3481+SELECT @@session.init_file;
3482+ERROR HY000: Variable 'init_file' is a GLOBAL variable
3483+SELECT @@global.init_file;
3484+@@global.init_file
3485+#
3486+SET @@session.init_file= 'x';
3487+ERROR HY000: Variable 'init_file' is a read only variable
3488+SET @@global.init_file= 'x';
3489+ERROR HY000: Variable 'init_file' is a read only variable
3490+#
3491+SHOW VARIABLES like 'language';
3492+Variable_name Value
3493+language #
3494+SELECT @@session.language;
3495+ERROR HY000: Variable 'language' is a GLOBAL variable
3496+SELECT @@global.language;
3497+@@global.language
3498+#
3499+SET @@session.language= 'x';
3500+ERROR HY000: Variable 'language' is a read only variable
3501+SET @@global.language= 'x';
3502+ERROR HY000: Variable 'language' is a read only variable
3503+#
3504+SHOW VARIABLES like 'large_page_size';
3505+Variable_name Value
3506+large_page_size #
3507+SELECT @@session.large_page_size;
3508+ERROR HY000: Variable 'large_page_size' is a GLOBAL variable
3509+SELECT @@global.large_page_size;
3510+@@global.large_page_size
3511+#
3512+SET @@session.large_page_size= 7;
3513+ERROR HY000: Variable 'large_page_size' is a read only variable
3514+SET @@global.large_page_size= 7;
3515+ERROR HY000: Variable 'large_page_size' is a read only variable
3516+#
3517+SHOW VARIABLES like 'large_pages';
3518+Variable_name Value
3519+large_pages #
3520+SELECT @@session.large_pages;
3521+ERROR HY000: Variable 'large_pages' is a GLOBAL variable
3522+SELECT @@global.large_pages;
3523+@@global.large_pages
3524+#
3525+SET @@session.large_pages= true;
3526+ERROR HY000: Variable 'large_pages' is a read only variable
3527+SET @@global.large_pages= true;
3528+ERROR HY000: Variable 'large_pages' is a read only variable
3529+#
3530+SHOW VARIABLES like 'log_bin';
3531+Variable_name Value
3532+log_bin OFF
3533+SELECT @@session.log_bin;
3534+ERROR HY000: Variable 'log_bin' is a GLOBAL variable
3535+SELECT @@global.log_bin;
3536+@@global.log_bin
3537+0
3538+SET @@session.log_bin= true;
3539+ERROR HY000: Variable 'log_bin' is a read only variable
3540+SET @@global.log_bin= true;
3541+ERROR HY000: Variable 'log_bin' is a read only variable
3542+#
3543+SHOW VARIABLES like 'log_error';
3544+Variable_name Value
3545+log_error #
3546+SELECT @@session.log_error;
3547+ERROR HY000: Variable 'log_error' is a GLOBAL variable
3548+SELECT @@global.log_error;
3549+@@global.log_error
3550+#
3551+SET @@session.log_error= 'x';
3552+ERROR HY000: Variable 'log_error' is a read only variable
3553+SET @@global.log_error= 'x';
3554+ERROR HY000: Variable 'log_error' is a read only variable
3555+#
3556+SHOW VARIABLES like 'lower_case_file_system';
3557+Variable_name Value
3558+lower_case_file_system #
3559+SELECT @@session.lower_case_file_system;
3560+ERROR HY000: Variable 'lower_case_file_system' is a GLOBAL variable
3561+SELECT @@global.lower_case_file_system;
3562+@@global.lower_case_file_system
3563+#
3564+SET @@session.lower_case_file_system= true;
3565+ERROR HY000: Variable 'lower_case_file_system' is a read only variable
3566+SET @@global.lower_case_file_system= true;
3567+ERROR HY000: Variable 'lower_case_file_system' is a read only variable
3568+#
3569+SHOW VARIABLES like 'lower_case_table_names';
3570+Variable_name Value
3571+lower_case_table_names #
3572+SELECT @@session.lower_case_table_names;
3573+ERROR HY000: Variable 'lower_case_table_names' is a GLOBAL variable
3574+SELECT @@global.lower_case_table_names;
3575+@@global.lower_case_table_names
3576+#
3577+SET @@session.lower_case_table_names= 7;
3578+ERROR HY000: Variable 'lower_case_table_names' is a read only variable
3579+SET @@global.lower_case_table_names= 7;
3580+ERROR HY000: Variable 'lower_case_table_names' is a read only variable
3581+#
3582+SHOW VARIABLES like 'myisam_recover_options';
3583+Variable_name Value
3584+myisam_recover_options OFF
3585+SELECT @@session.myisam_recover_options;
3586+ERROR HY000: Variable 'myisam_recover_options' is a GLOBAL variable
3587+SELECT @@global.myisam_recover_options;
3588+@@global.myisam_recover_options
3589+OFF
3590+SET @@session.myisam_recover_options= 'x';
3591+ERROR HY000: Variable 'myisam_recover_options' is a read only variable
3592+SET @@global.myisam_recover_options= 'x';
3593+ERROR HY000: Variable 'myisam_recover_options' is a read only variable
3594+#
3595+SHOW VARIABLES like 'open_files_limit';
3596+Variable_name Value
3597+open_files_limit #
3598+SELECT @@session.open_files_limit;
3599+ERROR HY000: Variable 'open_files_limit' is a GLOBAL variable
3600+SELECT @@global.open_files_limit;
3601+@@global.open_files_limit
3602+#
3603+SET @@session.open_files_limit= 7;
3604+ERROR HY000: Variable 'open_files_limit' is a read only variable
3605+SET @@global.open_files_limit= 7;
3606+ERROR HY000: Variable 'open_files_limit' is a read only variable
3607+#
3608+SHOW VARIABLES like 'pid_file';
3609+Variable_name Value
3610+pid_file #
3611+SELECT @@session.pid_file;
3612+ERROR HY000: Variable 'pid_file' is a GLOBAL variable
3613+SELECT @@global.pid_file;
3614+@@global.pid_file
3615+#
3616+SET @@session.pid_file= 'x';
3617+ERROR HY000: Variable 'pid_file' is a read only variable
3618+SET @@global.pid_file= 'x';
3619+ERROR HY000: Variable 'pid_file' is a read only variable
3620+#
3621+SHOW VARIABLES like 'plugin_dir';
3622+Variable_name Value
3623+plugin_dir #
3624+SELECT @@session.plugin_dir;
3625+ERROR HY000: Variable 'plugin_dir' is a GLOBAL variable
3626+SELECT @@global.plugin_dir;
3627+@@global.plugin_dir
3628+#
3629+SET @@session.plugin_dir= 'x';
3630+ERROR HY000: Variable 'plugin_dir' is a read only variable
3631+SET @@global.plugin_dir= 'x';
3632+ERROR HY000: Variable 'plugin_dir' is a read only variable
3633+#
3634+SHOW VARIABLES like 'port';
3635+Variable_name Value
3636+port #
3637+SELECT @@session.port;
3638+ERROR HY000: Variable 'port' is a GLOBAL variable
3639+SELECT @@global.port;
3640+@@global.port
3641+#
3642+SET @@session.port= 7;
3643+ERROR HY000: Variable 'port' is a read only variable
3644+SET @@global.port= 7;
3645+ERROR HY000: Variable 'port' is a read only variable
3646+#
3647+SHOW VARIABLES like 'protocol_version';
3648+Variable_name Value
3649+protocol_version 10
3650+SELECT @@session.protocol_version;
3651+ERROR HY000: Variable 'protocol_version' is a GLOBAL variable
3652+SELECT @@global.protocol_version;
3653+@@global.protocol_version
3654+10
3655+SET @@session.protocol_version= 7;
3656+ERROR HY000: Variable 'protocol_version' is a read only variable
3657+SET @@global.protocol_version= 7;
3658+ERROR HY000: Variable 'protocol_version' is a read only variable
3659+#
3660+SHOW VARIABLES like 'skip_external_locking';
3661+Variable_name Value
3662+skip_external_locking ON
3663+SELECT @@session.skip_external_locking;
3664+ERROR HY000: Variable 'skip_external_locking' is a GLOBAL variable
3665+SELECT @@global.skip_external_locking;
3666+@@global.skip_external_locking
3667+1
3668+SET @@session.skip_external_locking= true;
3669+ERROR HY000: Variable 'skip_external_locking' is a read only variable
3670+SET @@global.skip_external_locking= true;
3671+ERROR HY000: Variable 'skip_external_locking' is a read only variable
3672+#
3673+SHOW VARIABLES like 'skip_networking';
3674+Variable_name Value
3675+skip_networking OFF
3676+SELECT @@session.skip_networking;
3677+ERROR HY000: Variable 'skip_networking' is a GLOBAL variable
3678+SELECT @@global.skip_networking;
3679+@@global.skip_networking
3680+0
3681+SET @@session.skip_networking= true;
3682+ERROR HY000: Variable 'skip_networking' is a read only variable
3683+SET @@global.skip_networking= true;
3684+ERROR HY000: Variable 'skip_networking' is a read only variable
3685+#
3686+SHOW VARIABLES like 'skip_show_database';
3687+Variable_name Value
3688+skip_show_database OFF
3689+SELECT @@session.skip_show_database;
3690+ERROR HY000: Variable 'skip_show_database' is a GLOBAL variable
3691+SELECT @@global.skip_show_database;
3692+@@global.skip_show_database
3693+0
3694+SET @@session.skip_show_database= true;
3695+ERROR HY000: Variable 'skip_show_database' is a read only variable
3696+SET @@global.skip_show_database= true;
3697+ERROR HY000: Variable 'skip_show_database' is a read only variable
3698+#
3699+SHOW VARIABLES like 'thread_stack';
3700+Variable_name Value
3701+thread_stack #
3702+SELECT @@session.thread_stack;
3703+ERROR HY000: Variable 'thread_stack' is a GLOBAL variable
3704+SELECT @@global.thread_stack;
3705+@@global.thread_stack
3706+#
3707+SET @@session.thread_stack= 7;
3708+ERROR HY000: Variable 'thread_stack' is a read only variable
3709+SET @@global.thread_stack= 7;
3710+ERROR HY000: Variable 'thread_stack' is a read only variable
3711+SELECT @@global.expire_logs_days INTO @old_eld;
3712+SET GLOBAL expire_logs_days = -1;
3713+Warnings:
3714+Warning 1292 Truncated incorrect expire_logs_days value: '-1'
3715+needs to've been adjusted (0)
3716+SELECT @@global.expire_logs_days;
3717+@@global.expire_logs_days
3718+0
3719+SET GLOBAL expire_logs_days = 11;
3720+SET @old_mode=@@sql_mode;
3721+SET SESSION sql_mode = 'TRADITIONAL';
3722+SET GLOBAL expire_logs_days = 100;
3723+ERROR 42000: Variable 'expire_logs_days' can't be set to the value of '100'
3724+needs to be unchanged (11)
3725+SELECT @@global.expire_logs_days;
3726+@@global.expire_logs_days
3727+11
3728+SET SESSION sql_mode = @old_mode;
3729+SET GLOBAL expire_logs_days = 100;
3730+Warnings:
3731+Warning 1292 Truncated incorrect expire_logs_days value: '100'
3732+needs to've been adjusted (99)
3733+SELECT @@global.expire_logs_days;
3734+@@global.expire_logs_days
3735+99
3736+SET GLOBAL expire_logs_days = 11;
3737+SET GLOBAL expire_logs_days = 99;
3738+needs to pass with no warnings (99)
3739+SELECT @@global.expire_logs_days;
3740+@@global.expire_logs_days
3741+99
3742+SET GLOBAL expire_logs_days = @old_eld;
3743+SET GLOBAL auto_increment_offset=-1;
3744+Warnings:
3745+Warning 1292 Truncated incorrect auto_increment_offset value: '-1'
3746+SET GLOBAL auto_increment_offset=0;
3747+Warnings:
3748+Warning 1292 Truncated incorrect auto_increment_offset value: '0'
3749+select @@storage_engine;
3750+Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
3751+def @@storage_engine 253 6 6 N 1 31 8
3752+@@storage_engine
3753+MyISAM
3754+SET @old_server_id = @@GLOBAL.server_id;
3755+SET GLOBAL server_id = (1 << 32) - 1;
3756+SELECT @@GLOBAL.server_id;
3757+@@GLOBAL.server_id
3758+4294967295
3759+SET GLOBAL server_id = (1 << 32);
3760+Warnings:
3761+Warning 1292 Truncated incorrect server_id value: '4294967296'
3762+SELECT @@GLOBAL.server_id;
3763+@@GLOBAL.server_id
3764+4294967295
3765+SET GLOBAL server_id = (1 << 60);
3766+Warnings:
3767+Warning 1292 Truncated incorrect server_id value: '1152921504606846976'
3768+SELECT @@GLOBAL.server_id;
3769+@@GLOBAL.server_id
3770+4294967295
3771+SET GLOBAL server_id = 0;
3772+SELECT @@GLOBAL.server_id;
3773+@@GLOBAL.server_id
3774+0
3775+SET GLOBAL server_id = -1;
3776+Warnings:
3777+Warning 1292 Truncated incorrect server_id value: '-1'
3778+SELECT @@GLOBAL.server_id;
3779+@@GLOBAL.server_id
3780+0
3781+SET GLOBAL server_id = @old_server_id;
3782+End of 5.1 tests
3783
3784=== modified file 'test/mysql-test/r/view_grant.result'
3785--- test/mysql-test/r/view_grant.result 2008-07-16 08:46:49 +0000
3786+++ test/mysql-test/r/view_grant.result 2009-06-02 21:32:52 +0000
3787@@ -28,7 +28,7 @@
3788 ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table 't2'
3789 show create view v1;
3790 View Create View character_set_client collation_connection
3791-v1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_1`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v1` AS select `mysqltest`.`t1`.`a` AS `a`,`mysqltest`.`t1`.`b` AS `b` from `mysqltest`.`t1` latin1 latin1_swedish_ci
3792+v1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_1`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `mysqltest`.`t1`.`a` AS `a`,`mysqltest`.`t1`.`b` AS `b` from `mysqltest`.`t1` latin1 latin1_swedish_ci
3793 grant create view,drop,select on test.* to mysqltest_1@localhost;
3794 use test;
3795 alter view v1 as select * from mysqltest.t1;
3796@@ -309,7 +309,7 @@
3797 create view v1 as select * from mysqltest.t1;
3798 show create view v1;
3799 View Create View character_set_client collation_connection
3800-v1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_1`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v1` AS select `mysqltest`.`t1`.`a` AS `a`,`mysqltest`.`t1`.`b` AS `b` from `mysqltest`.`t1` latin1 latin1_swedish_ci
3801+v1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_1`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `mysqltest`.`t1`.`a` AS `a`,`mysqltest`.`t1`.`b` AS `b` from `mysqltest`.`t1` latin1 latin1_swedish_ci
3802 revoke select on mysqltest.t1 from mysqltest_1@localhost;
3803 select * from v1;
3804 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
3805
3806=== modified file 'test/mysql-test/r/warnings.result'
3807--- test/mysql-test/r/warnings.result 2008-11-05 12:01:29 +0000
3808+++ test/mysql-test/r/warnings.result 2009-06-02 21:34:42 +0000
3809@@ -98,10 +98,11 @@
3810 Warning 1265 Data truncated for column 'c' at row 2
3811 alter table t1 add d char(2);
3812 update t1 set a=NULL where a=10;
3813-ERROR 23000: Column 'a' cannot be null
3814+Warnings:
3815+Warning 1048 Column 'a' cannot be null
3816 update t1 set c='mysql ab' where c='test';
3817 Warnings:
3818-Warning 1265 Data truncated for column 'c' at row 4
3819+Warning 1265 Data truncated for column 'c' at row 3
3820 update t1 set d=c;
3821 Warnings:
3822 Warning 1265 Data truncated for column 'd' at row 1
3823@@ -167,7 +168,7 @@
3824 drop table t1;
3825 set table_type=MYISAM;
3826 Warnings:
3827-Warning 1287 The syntax '@@table_type' is deprecated and will be removed in MySQL 5.2. Please use '@@storage_engine' instead
3828+Warning 1287 The syntax '@@table_type' is deprecated and will be removed in MySQL 6.0. Please use '@@storage_engine' instead
3829 create table t1 (a int);
3830 insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
3831 update t1 set a='abc';
3832
3833=== modified file 'test/mysql-test/t/auto_increment.test'
3834--- test/mysql-test/t/auto_increment.test 2009-04-02 20:28:52 +0000
3835+++ test/mysql-test/t/auto_increment.test 2009-06-02 00:08:42 +0000
3836@@ -150,7 +150,6 @@
3837 update t1 set a=0 where b=5;
3838 select * from t1 order by b;
3839 delete from t1 where a=0;
3840---error 1048
3841 update t1 set a=NULL where b=6;
3842 update t1 set a=300 where b=7;
3843 SET SQL_MODE='';
3844@@ -166,7 +165,6 @@
3845 update t1 set a=0 where b=12;
3846 select * from t1 order by b;
3847 delete from t1 where a=0;
3848---error 1048
3849 update t1 set a=NULL where b=13;
3850 update t1 set a=500 where b=14;
3851 select * from t1 order by b;
3852
3853=== modified file 'test/mysql-test/t/func_compress.test'
3854--- test/mysql-test/t/func_compress.test 2007-01-29 15:04:29 +0000
3855+++ test/mysql-test/t/func_compress.test 2009-06-02 00:20:29 +0000
3856@@ -43,9 +43,15 @@
3857 # note that when LOW_MEMORY is set the "test" below is meaningless
3858 #
3859
3860-set @@max_allowed_packet=1048576*100;
3861+set @@global.max_allowed_packet=1048576*100;
3862 --replace_result "''" XXX "'1'" XXX
3863+
3864+# reconnect to make the new max packet size take effect
3865+--connect (newconn, localhost, root,,)
3866 eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null;
3867+disconnect newconn;
3868+connection default;
3869+set @@global.max_allowed_packet=default;
3870
3871 #
3872 # Bug #18643: problem with null values
3873
3874=== modified file 'test/mysql-test/t/myisam-blob.test'
3875--- test/mysql-test/t/myisam-blob.test 2007-03-13 19:06:47 +0000
3876+++ test/mysql-test/t/myisam-blob.test 2009-06-02 17:54:03 +0000
3877@@ -6,7 +6,9 @@
3878 drop table if exists t1;
3879 --enable_warnings
3880
3881-set @@max_allowed_packet=20*1024*1024; # PBXT avoid overflow
3882+# Set packet size and reconnect
3883+SET global max_allowed_packet=20*1024*1024;
3884+--connect (newconn, localhost, root,,)
3885
3886 # Bug #2159 (Problem with update of blob to > 16M)
3887
3888
3889=== modified file 'test/mysql-test/t/myisam.test'
3890--- test/mysql-test/t/myisam.test 2008-05-30 12:31:39 +0000
3891+++ test/mysql-test/t/myisam.test 2009-06-02 17:55:55 +0000
3892@@ -749,7 +749,7 @@
3893 #
3894 CREATE TABLE t1(a CHAR(9), b VARCHAR(7)) ENGINE=pbxt;
3895 INSERT INTO t1(a) VALUES('xxxxxxxxx'),('xxxxxxxxx');
3896--- This is a PBXT bug:
3897+# This is a PBXT bug:
3898 -- error 1020
3899 UPDATE t1 AS ta1,t1 AS ta2 SET ta1.b='aaaaaa',ta2.b='bbbbbb';
3900 SELECT * FROM t1;
3901
3902=== modified file 'test/mysql-test/t/mysql_client_test.test'
3903--- test/mysql-test/t/mysql_client_test.test 2006-10-23 09:14:04 +0000
3904+++ test/mysql-test/t/mysql_client_test.test 2009-06-02 18:07:21 +0000
3905@@ -1,6 +1,8 @@
3906 # This test should work in embedded server after we fix mysqltest
3907 -- source include/not_embedded.inc
3908
3909+SET @old_general_log= @@global.general_log;
3910+
3911 # We run with different binaries for normal and --embedded-server
3912 #
3913 # If this test fails with "command "$MYSQL_CLIENT_TEST" failed",
3914@@ -8,9 +10,10 @@
3915 # server or run mysql-test-run --debug mysql_client_test and check
3916 # var/log/mysql_client_test.trace
3917
3918---exec echo "$MYSQL_CLIENT_TEST" > $MYSQLTEST_VARDIR/log/mysql_client_test.log 2>&1
3919---exec $MYSQL_CLIENT_TEST --getopt-ll-test=25600M >> $MYSQLTEST_VARDIR/log/mysql_client_test.log 2>&1
3920+--exec echo "$MYSQL_CLIENT_TEST" > $MYSQLTEST_VARDIR/log/mysql_client_test.out.log 2>&1
3921+--exec $MYSQL_CLIENT_TEST --getopt-ll-test=25600M >> $MYSQLTEST_VARDIR/log/mysql_client_test.out.log 2>&1
3922
3923 # End of 4.1 tests
3924 echo ok;
3925
3926+SET @@global.general_log= @old_general_log;
3927
3928=== modified file 'test/mysql-test/t/mysqltest.test'
3929--- test/mysql-test/t/mysqltest.test 2008-03-11 16:31:13 +0000
3930+++ test/mysql-test/t/mysqltest.test 2009-06-02 18:38:30 +0000
3931@@ -6,6 +6,9 @@
3932 # This test uses chmod, can't be run with root permissions
3933 -- source include/not_as_root.inc
3934
3935+# Save the initial number of concurrent sessions
3936+--source include/count_sessions.inc
3937+
3938 # ============================================================================
3939 #
3940 # Test of mysqltest itself
3941@@ -50,7 +53,7 @@
3942
3943 # ----------------------------------------------------------------------------
3944 # Negative case(statement):
3945-# The derived table t1 does not contain a column named 'friedrich' .
3946+# The derived table t1 does not contain a column named 'friedrich' .
3947 # --> ERROR 42S22: Unknown column 'friedrich' in 'field list and
3948 # --> 1054: Unknown column 'friedrich' in 'field list'
3949 # ----------------------------------------------------------------------------
3950@@ -62,7 +65,8 @@
3951 --exec echo "select friedrich from (select 1 as otto) as t1;" | $MYSQL_TEST 2>&1
3952
3953 # expectation = response
3954---error 1054
3955+--error ER_BAD_FIELD_ERROR
3956+
3957 select friedrich from (select 1 as otto) as t1;
3958
3959 # The following unmasked unsuccessful statement must give
3960@@ -91,6 +95,10 @@
3961 --error 1
3962 --exec echo "error S42S22; select otto from (select 1 as otto) as t1;" | $MYSQL_TEST 2>&1
3963
3964+# expecting a SQL-state for a command that can't give one should fail
3965+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
3966+--error 1
3967+--exec echo "error S00000; remove_file $MYSQLTEST_VARDIR/tmp/test_nonexistent.tmp;" | $MYSQL_TEST 2>&1
3968
3969
3970 # ----------------------------------------------------------------------------
3971@@ -116,7 +124,7 @@
3972 # $mysql_errno is a builtin variable of mysqltest and contains the return code
3973 # of the last command sent to the server.
3974 #
3975-# The following test cases often initialize $mysql_errno to 1064 by
3976+# The following test cases often initialize $mysql_errno to 1064 by
3977 # a command with wrong syntax.
3978 # Example: --error 1064 To prevent the abort after the error.
3979 # garbage ;
3980@@ -131,14 +139,16 @@
3981 #----------------------------------------------------------------------------
3982 # check mysql_errno = 1064 after statement with wrong syntax
3983 # ----------------------------------------------------------------------------
3984---error 1064
3985+--error ER_PARSE_ERROR
3986+
3987 garbage ;
3988 eval select $mysql_errno as "after_wrong_syntax_errno" ;
3989
3990 # ----------------------------------------------------------------------------
3991 # check if let $my_var= 'abc' ; affects $mysql_errno
3992 # ----------------------------------------------------------------------------
3993---error 1064
3994+--error ER_PARSE_ERROR
3995+
3996 garbage ;
3997 let $my_var= 'abc' ;
3998 eval select $mysql_errno as "after_let_var_equal_value" ;
3999@@ -146,7 +156,8 @@
4000 # ----------------------------------------------------------------------------
4001 # check if set @my_var= 'abc' ; affects $mysql_errno
4002 # ----------------------------------------------------------------------------
4003---error 1064
4004+--error ER_PARSE_ERROR
4005+
4006 garbage ;
4007 set @my_var= 'abc' ;
4008 eval select $mysql_errno as "after_set_var_equal_value" ;
4009@@ -155,7 +166,8 @@
4010 # check if the setting of --disable-warnings itself affects $mysql_errno
4011 # (May be --<whatever> modifies $mysql_errno.)
4012 # ----------------------------------------------------------------------------
4013---error 1064
4014+--error ER_PARSE_ERROR
4015+
4016 garbage ;
4017 --disable_warnings
4018 eval select $mysql_errno as "after_disable_warnings_command" ;
4019@@ -166,7 +178,8 @@
4020 # (May be disabled warnings affect $mysql_errno.)
4021 # ----------------------------------------------------------------------------
4022 drop table if exists t1 ;
4023---error 1064
4024+--error ER_PARSE_ERROR
4025+
4026 garbage ;
4027 drop table if exists t1 ;
4028 eval select $mysql_errno as "after_disable_warnings" ;
4029@@ -175,21 +188,26 @@
4030 # ----------------------------------------------------------------------------
4031 # check if masked errors affect $mysql_errno
4032 # ----------------------------------------------------------------------------
4033---error 1064
4034+--error ER_PARSE_ERROR
4035+
4036 garbage ;
4037---error 1146
4038+--error ER_NO_SUCH_TABLE
4039+
4040 select 3 from t1 ;
4041 eval select $mysql_errno as "after_minus_masked" ;
4042---error 1064
4043+--error ER_PARSE_ERROR
4044+
4045 garbage ;
4046---error 1146
4047+--error ER_NO_SUCH_TABLE
4048+
4049 select 3 from t1 ;
4050 eval select $mysql_errno as "after_!_masked" ;
4051
4052 # ----------------------------------------------------------------------------
4053 # Will manipulations of $mysql_errno be possible and visible ?
4054 # ----------------------------------------------------------------------------
4055---error 1064
4056+--error ER_PARSE_ERROR
4057+
4058 garbage ;
4059 let $mysql_errno= -1;
4060 eval select $mysql_errno as "after_let_errno_equal_value" ;
4061@@ -198,50 +216,61 @@
4062 # How affect actions on prepared statements $mysql_errno ?
4063 # ----------------------------------------------------------------------------
4064 # failing prepare
4065---error 1064
4066+--error ER_PARSE_ERROR
4067+
4068 garbage ;
4069---error 1146
4070+--error ER_NO_SUCH_TABLE
4071+
4072 prepare stmt from "select 3 from t1" ;
4073 eval select $mysql_errno as "after_failing_prepare" ;
4074 create table t1 ( f1 char(10));
4075
4076 # successful prepare
4077---error 1064
4078+--error ER_PARSE_ERROR
4079+
4080 garbage ;
4081 prepare stmt from "select 3 from t1" ;
4082 eval select $mysql_errno as "after_successful_prepare" ;
4083
4084 # successful execute
4085---error 1064
4086+--error ER_PARSE_ERROR
4087+
4088 garbage ;
4089 execute stmt;
4090 eval select $mysql_errno as "after_successful_execute" ;
4091
4092 # failing execute (table has been dropped)
4093 drop table t1;
4094---error 1064
4095+--error ER_PARSE_ERROR
4096+
4097 garbage ;
4098---error 1146
4099+--error ER_NO_SUCH_TABLE
4100+
4101 execute stmt;
4102 eval select $mysql_errno as "after_failing_execute" ;
4103
4104 # failing execute (unknown statement)
4105---error 1064
4106+--error ER_PARSE_ERROR
4107+
4108 garbage ;
4109---error 1243
4110+--error ER_UNKNOWN_STMT_HANDLER
4111+
4112 execute __stmt_;
4113 eval select $mysql_errno as "after_failing_execute" ;
4114
4115 # successful deallocate
4116---error 1064
4117+--error ER_PARSE_ERROR
4118+
4119 garbage ;
4120 deallocate prepare stmt;
4121 eval select $mysql_errno as "after_successful_deallocate" ;
4122
4123 # failing deallocate ( statement handle does not exist )
4124---error 1064
4125+--error ER_PARSE_ERROR
4126+
4127 garbage ;
4128---error 1243
4129+--error ER_UNKNOWN_STMT_HANDLER
4130+
4131 deallocate prepare __stmt_;
4132 eval select $mysql_errno as "after_failing_deallocate" ;
4133
4134@@ -266,7 +295,8 @@
4135 # ----------------------------------------------------------------------------
4136 # Switch off the abort on error and check the effect on $mysql_errno
4137 # ----------------------------------------------------------------------------
4138---error 1064
4139+--error ER_PARSE_ERROR
4140+
4141 garbage ;
4142 --disable_abort_on_error
4143 eval select $mysql_errno as "after_--disable_abort_on_error" ;
4144@@ -280,9 +310,11 @@
4145 # masked failing statements
4146 # ----------------------------------------------------------------------------
4147 # expected error = response
4148---error 1146
4149+--error ER_NO_SUCH_TABLE
4150+
4151 select 3 from t1 ;
4152---error 1146
4153+--error ER_NO_SUCH_TABLE
4154+
4155 select 3 from t1 ;
4156 eval select $mysql_errno as "after_!errno_masked_error" ;
4157 # expected error <> response
4158@@ -296,7 +328,8 @@
4159 # ----------------------------------------------------------------------------
4160 # Switch the abort on error on and check the effect on $mysql_errno
4161 # ----------------------------------------------------------------------------
4162---error 1064
4163+--error ER_PARSE_ERROR
4164+
4165 garbage ;
4166 --enable_abort_on_error
4167 eval select $mysql_errno as "after_--enable_abort_on_error" ;
4168@@ -305,7 +338,8 @@
4169 # masked failing statements
4170 # ----------------------------------------------------------------------------
4171 # expected error = response
4172---error 1146
4173+--error ER_NO_SUCH_TABLE
4174+
4175 select 3 from t1 ;
4176
4177 # ----------------------------------------------------------------------------
4178@@ -454,7 +488,7 @@
4179
4180 # Allow trailing # comment
4181 --sleep 1 # Wait for insert delayed to be executed.
4182---sleep 1 # Wait for insert delayed to be executed.
4183+--sleep 1 # Wait for insert delayed to be executed.
4184
4185 # ----------------------------------------------------------------------------
4186 # Test error
4187@@ -569,9 +603,6 @@
4188
4189 # Illegal use of exec
4190 --error 1
4191---exec echo "--exec false" | $MYSQL_TEST 2>&1
4192-
4193---error 1
4194 --exec echo "--exec " | $MYSQL_TEST 2>&1
4195
4196 # ----------------------------------------------------------------------------
4197@@ -679,7 +710,7 @@
4198 --error 1
4199 --exec echo "let hi;" | $MYSQL_TEST 2>&1
4200
4201-# More advanced test for bug#17280
4202+# More advanced test for Bug#17280
4203 let $success= 1;
4204 --echo # Execute: --echo # <whatever> success: \$success
4205 --echo # <whatever> success: $success
4206@@ -951,8 +982,6 @@
4207 --exec echo "system;" | $MYSQL_TEST 2>&1
4208 --error 1
4209 --exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1
4210---error 1
4211---exec echo "system false;" | $MYSQL_TEST 2>&1
4212
4213 --disable_abort_on_error
4214 system NonExistsinfComamdn 2> /dev/null;
4215@@ -1225,7 +1254,7 @@
4216 --exec echo "replace_result a;" | $MYSQL_TEST 2>&1
4217 --error 1
4218 --exec echo "replace_result a ;" | $MYSQL_TEST 2>&1
4219---exec echo "replace_result a b; echo OK;" | $MYSQL_TEST 2>&1
4220+--exec echo "replace_result a b; echo OK; exit;" | $MYSQL_TEST 2>&1
4221 --error 1
4222 --exec echo "--replace_result a b c" | $MYSQL_TEST 2>&1
4223 --error 1
4224@@ -1289,7 +1318,7 @@
4225 dec $i;
4226 }
4227 EOF
4228---exec echo "source $MYSQLTEST_VARDIR/tmp/mysqltest.sql; echo OK;" | $MYSQL_TEST 2>&1
4229+--exec echo "source $MYSQLTEST_VARDIR/tmp/mysqltest.sql; echo OK; exit;" | $MYSQL_TEST 2>&1
4230 remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
4231
4232 # Repeat connect/disconnect
4233@@ -1360,17 +1389,18 @@
4234
4235
4236 # ----------------------------------------------------------------------------
4237-# TODO Test queries, especially their errormessages... so it's easy to debug
4238+# TODO Test queries, especially their errormessages... so it's easy to debug
4239 # new scripts and diagnose errors
4240 # ----------------------------------------------------------------------------
4241
4242 # ----------------------------------------------------------------------------
4243-# Test bug#12386
4244+# Test Bug#12386
4245 # ----------------------------------------------------------------------------
4246 let $num= 2;
4247 while ($num)
4248 {
4249- --error 1064
4250+ --error ER_PARSE_ERROR
4251+
4252 failing_statement;
4253
4254 dec $num;
4255@@ -1380,7 +1410,7 @@
4256
4257
4258 #
4259-# Bug #10251: Identifiers containing quotes not handled correctly
4260+# Bug#10251 Identifiers containing quotes not handled correctly
4261 #
4262 select 1 as `a'b`, 2 as `a"b`;
4263
4264@@ -1401,7 +1431,7 @@
4265
4266 # The message contains more then 80 characters on multiple lines
4267 # and is kept between double quotes.
4268-let $message=
4269+let $message=
4270 "Here comes a very very long message that
4271 - is longer then 80 characters and
4272 - consists of several lines";
4273@@ -1429,14 +1459,16 @@
4274 #
4275 # Test zero length result file. Should not pass
4276 #
4277---exec touch $MYSQLTEST_VARDIR/tmp/zero_length_file.result
4278+--exec echo '' > $MYSQLTEST_VARDIR/tmp/zero_length_file.result
4279 --exec echo "echo ok;" > $MYSQLTEST_VARDIR/tmp/query.sql
4280 --error 1
4281 --exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/query.sql -R $MYSQLTEST_VARDIR/tmp/zero_length_file.result > /dev/null 2>&1
4282
4283 remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.result;
4284 --error 0,1
4285-remove_file $MYSQLTEST_VARDIR/log/zero_length_file.reject;
4286+remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.reject;
4287+--error 0,1
4288+remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.log;
4289 --error 0,1
4290 remove_file $MYSQL_TEST_DIR/r/zero_length_file.reject;
4291
4292@@ -1460,8 +1492,8 @@
4293 #--exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/query.sql -R $MYSQLTEST_VARDIR/tmp/result_file.result 2>&1
4294
4295 #
4296-# Bug #11731 mysqltest in multi-statement queries ignores errors in
4297-# non-1st queries
4298+# Bug#11731 mysqltest in multi-statement queries ignores errors in
4299+# non-1st queries
4300 #
4301
4302 echo Failing multi statement query;
4303@@ -1482,7 +1514,8 @@
4304 --error 1
4305 --exec $MYSQL_TEST --record -x $MYSQLTEST_VARDIR/tmp/bug11731.sql -R $MYSQLTEST_VARDIR/tmp/bug11731.out 2>&1
4306 # The .out file should be non existent
4307---exec test ! -s $MYSQLTEST_VARDIR/tmp/bug11731.out
4308+--error 1
4309+--file_exists $MYSQLTEST_VARDIR/tmp/bug11731.out
4310 drop table t1;
4311
4312
4313@@ -1496,6 +1529,7 @@
4314 --exec echo "select 'select-me';" >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
4315 --exec echo "insertz "error query"||||" >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
4316 --exec echo "delimiter ;||||" >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
4317+--exec echo "exit;" >> $MYSQLTEST_VARDIR/tmp/bug11731.sql
4318
4319 # These two should work since the error is expected
4320 --exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/bug11731.sql 2>&1
4321@@ -1503,26 +1537,29 @@
4322
4323 --exec $MYSQL_TEST --record -x $MYSQLTEST_VARDIR/tmp/bug11731.sql -R $MYSQLTEST_VARDIR/tmp/bug11731.out 2>&1
4324 # The .out file should exist
4325---exec test -s $MYSQLTEST_VARDIR/tmp/bug11731.out
4326+--file_exists $MYSQLTEST_VARDIR/tmp/bug11731.out
4327 drop table t1;
4328 remove_file $MYSQLTEST_VARDIR/tmp/bug11731.out;
4329 remove_file $MYSQLTEST_VARDIR/log/bug11731.log;
4330 remove_file $MYSQLTEST_VARDIR/tmp/bug11731.sql;
4331
4332 #
4333-# Bug#19890 mysqltest: "query" command is broken
4334+# Bug#19890 mysqltest "query" command is broken
4335 #
4336
4337 # It should be possible to use the command "query" to force mysqltest to
4338 # send the command to the server although it's a builtin mysqltest command.
4339---error 1064
4340+--error ER_PARSE_ERROR
4341+
4342 query sleep;
4343
4344---error 1064
4345+--error ER_PARSE_ERROR
4346+
4347 --query sleep
4348
4349 # Just an empty query command
4350---error 1065
4351+--error ER_EMPTY_QUERY
4352+
4353 query ;
4354
4355 # test for replace_regex
4356@@ -1533,7 +1570,7 @@
4357 select "at" as col1, "AT" as col2, "c" as col3;
4358
4359 --replace_regex /a/b/ /ct/d/
4360-select "a" as col1, "ct" as col2;
4361+select "a" as col1, "ct" as col2;
4362
4363 --replace_regex /(strawberry)/raspberry and \1/ /blueberry/blackberry/ /potato/tomato/;
4364 select "strawberry","blueberry","potato";
4365@@ -1551,7 +1588,7 @@
4366 --error 1
4367 --exec echo "--replace_regex /a b c" | $MYSQL_TEST 2>&1
4368 --error 1
4369---exec echo "replace_regex /a /b c ;" | $MYSQL_TEST 2>&1
4370+--exec echo "replace_regex /a /b c ;" | $MYSQL_TEST 2>&1
4371
4372 # REQUIREMENT
4373 # replace_regex should replace substitutions from left to right in output
4374@@ -1688,6 +1725,7 @@
4375 --diff_files $MYSQLTEST_VARDIR/tmp/diff1.tmp $MYSQLTEST_VARDIR/tmp/diff4.tmp
4376 --error 1
4377 --diff_files $MYSQLTEST_VARDIR/tmp/diff4.tmp $MYSQLTEST_VARDIR/tmp/diff1.tmp
4378+exit;
4379 EOF
4380
4381 # Execute the above diffs, and send their output to /dev/null - only
4382@@ -1915,12 +1953,13 @@
4383 # 8. Ensure that "sorted_result " does not change the semantics of
4384 # "--error ...." or the protocol output after such an expected failure
4385 --sorted_result
4386---error 1146
4387+--error ER_NO_SUCH_TABLE
4388+
4389 SELECT '2' as "my_col1",2 as "my_col2"
4390 UNION
4391 SELECT '1',1 from t2;
4392
4393-# 9. Ensure that several result formatting options including "sorted_result"
4394+# 9. Ensure that several result formatting options including "sorted_result"
4395 # - have all an effect
4396 # - "--sorted_result" does not need to be direct before the statement
4397 # - Row sorting is applied after modification of the column content
4398@@ -2101,5 +2140,121 @@
4399 --change_user root,,
4400 --change_user root,,test
4401
4402+# ----------------------------------------------------------------------------
4403+# Test mkdir and rmdir command
4404+# ----------------------------------------------------------------------------
4405+
4406+mkdir $MYSQLTEST_VARDIR/tmp/testdir;
4407+rmdir $MYSQLTEST_VARDIR/tmp/testdir;
4408+
4409+# Directory already exist
4410+mkdir $MYSQLTEST_VARDIR/tmp/testdir;
4411+--error 1
4412+mkdir $MYSQLTEST_VARDIR/tmp/testdir;
4413+
4414+# Remove dir with file inside
4415+write_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt;
4416+hello
4417+EOF
4418+
4419+list_files $MYSQLTEST_VARDIR/tmp/testdir;
4420+# list_files gets the directory list before creating the new file
4421+list_files_write_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir *;
4422+list_files_append_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir *2*;
4423+list_files_write_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir file?.txt;
4424+list_files_append_file $MYSQLTEST_VARDIR/tmp/testdir/file3.txt $MYSQLTEST_VARDIR/tmp/testdir file*.txt;
4425+diff_files $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir/file3.txt;
4426+--error 1
4427+rmdir $MYSQLTEST_VARDIR/tmp/testdir;
4428+
4429+cat_file $MYSQLTEST_VARDIR/tmp/testdir/file3.txt;
4430+
4431+remove_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt;
4432+remove_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt;
4433+remove_file $MYSQLTEST_VARDIR/tmp/testdir/file3.txt;
4434+rmdir $MYSQLTEST_VARDIR/tmp/testdir;
4435+
4436+#
4437+# Bug#36041 mysql-test-run doesn't seem to string match 100% effectively
4438+# on Windows
4439+#
4440+
4441+--replace_result c:\\a.txt z
4442+SELECT 'c:\\a.txt' AS col;
4443+
4444+#
4445+# Bug#32307 mysqltest - does not detect illegal if syntax
4446+#
4447+
4448+let $test= 1;
4449+if ($test){
4450+ echo hej;
4451+}
4452+
4453+--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql
4454+if ($mysql_errno != 1436)
4455+{
4456+ echo ^ Should not be allowed!
4457+}
4458+EOF
4459+--error 1
4460+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
4461+remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
4462+
4463+
4464+# ----------------------------------------------------------------------------
4465+# Test that -- is not allowed as comment, only as mysqltest builtin command
4466+# ----------------------------------------------------------------------------
4467+
4468+# valid
4469+select 1;
4470+--query select 1
4471+--query -- a comment for the server
4472+
4473+# Not valid, "select" is not a mysqltest command
4474+--error 1
4475+--exec echo "--select 1;" | $MYSQL_TEST 2>&1
4476+
4477+
4478+# ----------------------------------------------------------------------------
4479+# BUG#35701 please allow test language variables in connection and sync_slave_with_master
4480+# Test that "connection $variable" works and that $CURRENT_CONNECTION has the right value.
4481+# ----------------------------------------------------------------------------
4482+
4483+connect (con1,localhost,root,,);
4484+--echo $CURRENT_CONNECTION
4485+connect (con2,localhost,root,,);
4486+--echo $CURRENT_CONNECTION
4487+
4488+connection default;
4489+--echo $CURRENT_CONNECTION
4490+
4491+connection con1;
4492+--echo $CURRENT_CONNECTION
4493+
4494+connection con2;
4495+--echo $CURRENT_CONNECTION
4496+
4497+let $x= con1;
4498+let $y= con2;
4499+
4500+connection $x;
4501+--echo $CURRENT_CONNECTION
4502+
4503+connection $y;
4504+--echo $CURRENT_CONNECTION
4505+
4506+# Disconnect the not selected connection
4507+disconnect $x;
4508+--echo $CURRENT_CONNECTION
4509+
4510+# Disconnect the selected connection
4511+disconnect $y;
4512+--echo $CURRENT_CONNECTION
4513+
4514+
4515 --echo End of tests
4516
4517+connection default;
4518+# Wait till we reached the initial number of concurrent sessions
4519+--source include/wait_until_count_sessions.inc
4520
4521=== modified file 'test/mysql-test/t/null.test'
4522--- test/mysql-test/t/null.test 2009-04-02 20:28:52 +0000
4523+++ test/mysql-test/t/null.test 2009-06-02 18:58:34 +0000
4524@@ -61,9 +61,7 @@
4525 #
4526 CREATE TABLE t1 (a varchar(16) NOT NULL default '', b smallint(6) NOT NULL default 0, c datetime NOT NULL default '0000-00-00 00:00:00', d smallint(6) NOT NULL default 0);
4527 INSERT INTO t1 SET a = "", d= "2003-01-14 03:54:55";
4528---error 1048
4529 UPDATE t1 SET d=1/NULL;
4530---error 1048
4531 UPDATE t1 SET d=NULL;
4532 --error 1048
4533 INSERT INTO t1 (a) values (null);
4534
4535=== modified file 'test/mysql-test/t/packet.test'
4536--- test/mysql-test/t/packet.test 2006-10-23 09:14:04 +0000
4537+++ test/mysql-test/t/packet.test 2009-06-02 19:02:51 +0000
4538@@ -4,35 +4,53 @@
4539 # swallowing them and returning an error
4540 --source include/not_windows.inc
4541
4542+# Save the initial number of concurrent sessions
4543+--source include/count_sessions.inc
4544+
4545+
4546 #
4547 # Check protocol handling
4548 #
4549
4550-connect (con1,localhost,root,,);
4551-
4552-connection con1;
4553+set @max_allowed_packet=@@global.max_allowed_packet;
4554+set @net_buffer_length=@@global.net_buffer_length;
4555+
4556+
4557+# setting values below minimum threshold of 1024 will cause truncating
4558 set global max_allowed_packet=100;
4559-set max_allowed_packet=100;
4560 set global net_buffer_length=100;
4561-set net_buffer_length=100;
4562-# Have to be > 1024 as min value of net_buffer_length is 1024
4563+
4564+# is not yet in effect
4565 SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
4566-# Should return NULL as 2000 is bigger than max_allowed_packet
4567 select repeat('a',2000);
4568
4569 #
4570-# Connection 2 should get error for too big packets
4571+# Connection 1 should get error for too big packets
4572 #
4573-connect (con2,localhost,root,,);
4574-connection con2;
4575+connect (con1,localhost,root,,);
4576+connection con1;
4577 select @@net_buffer_length, @@max_allowed_packet;
4578---error 1153
4579+--error ER_NET_PACKET_TOO_LARGE
4580 SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
4581+connection default;
4582+disconnect con1;
4583+
4584+#
4585+# Reset to default values and reconnect
4586+#
4587 set global max_allowed_packet=default;
4588-set max_allowed_packet=default;
4589 set global net_buffer_length=default;
4590-set net_buffer_length=default;
4591+connect (con2,localhost,root,,);
4592+connection con2;
4593 SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
4594 select length(repeat('a',2000));
4595+connection default;
4596+disconnect con2;
4597+
4598+set global max_allowed_packet=@max_allowed_packet;
4599+set global net_buffer_length=@net_buffer_length;
4600
4601 # End of 4.1 tests
4602+
4603+# Wait till we reached the initial number of concurrent sessions
4604+--source include/wait_until_count_sessions.inc
4605
4606=== modified file 'test/mysql-test/t/ps.test'
4607--- test/mysql-test/t/ps.test 2008-12-11 01:07:22 +0000
4608+++ test/mysql-test/t/ps.test 2009-06-02 20:19:18 +0000
4609@@ -1658,7 +1658,7 @@
4610 let $iterations= 100;
4611 --disable_query_log
4612 --disable_result_log
4613-while ($iterations > 0)
4614+while ($iterations)
4615 {
4616 --error ER_PARSE_ERROR
4617 PREPARE stmt FROM "CREATE PROCEDURE p1()";
4618
4619=== modified file 'test/mysql-test/t/row.test'
4620--- test/mysql-test/t/row.test 2006-10-31 13:15:57 +0000
4621+++ test/mysql-test/t/row.test 2009-06-02 20:28:33 +0000
4622@@ -7,10 +7,8 @@
4623 select row(10,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3));
4624 select row(1,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
4625 select row(10,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
4626---disable_ps_warnings
4627 select row('a',1.5,3) IN (row(1,2,3), row('a',1.5,3), row('a','a','a'));
4628 select row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3));
4629---enable_ps_warnings
4630 select row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3));
4631 select row('a',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
4632 select row('b',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
4633
4634=== modified file 'test/mysql-test/t/schema.test'
4635--- test/mysql-test/t/schema.test 2006-10-23 09:14:04 +0000
4636+++ test/mysql-test/t/schema.test 2009-06-02 22:12:20 +0000
4637@@ -10,5 +10,7 @@
4638
4639 create schema foo;
4640 show create schema foo;
4641+# force PBXT schema to be created
4642+create table t1 (id int) engine=pbxt;
4643 show schemas;
4644 drop schema foo;
4645
4646=== modified file 'test/mysql-test/t/union.test'
4647--- test/mysql-test/t/union.test 2009-04-02 20:28:52 +0000
4648+++ test/mysql-test/t/union.test 2009-06-02 20:52:31 +0000
4649@@ -802,8 +802,10 @@
4650 # exceeds mediumtext maximum length
4651 #
4652
4653-SELECT @tmp_max:= @@max_allowed_packet;
4654-SET max_allowed_packet=25000000;
4655+SELECT @tmp_max:= @@global.max_allowed_packet;
4656+SET @@global.max_allowed_packet=25000000;
4657+# switching connection to allow the new max_allowed_packet take effect
4658+--connect (newconn, localhost, root,,)
4659 CREATE TABLE t1 (a mediumtext);
4660 CREATE TABLE t2 (b varchar(20));
4661 INSERT INTO t1 VALUES ('a');
4662@@ -825,7 +827,9 @@
4663 CREATE TABLE t3 SELECT REPEAT(a,2) AS a FROM t1 UNION SELECT b FROM t2;
4664 SHOW CREATE TABLE t3;
4665 DROP TABLES t1,t2,t3;
4666-SET max_allowed_packet:= @tmp_max;
4667+--connection default
4668+SET @@global.max_allowed_packet:= @tmp_max;
4669+--disconnect newconn
4670
4671 #
4672 # Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM
4673
4674=== modified file 'test/mysql-test/t/variables.test'
4675--- test/mysql-test/t/variables.test 2008-11-13 18:01:16 +0000
4676+++ test/mysql-test/t/variables.test 2009-06-02 21:30:51 +0000
4677@@ -6,7 +6,7 @@
4678 --enable_warnings
4679
4680 #
4681-# Bug #19263: variables.test doesn't clean up after itself (I/II -- save)
4682+# Bug#19263: variables.test doesn't clean up after itself (I/II -- save)
4683 #
4684 set @my_binlog_cache_size =@@global.binlog_cache_size;
4685 set @my_connect_timeout =@@global.connect_timeout;
4686@@ -18,13 +18,13 @@
4687 set @my_max_binlog_cache_size =@@global.max_binlog_cache_size;
4688 set @my_max_binlog_size =@@global.max_binlog_size;
4689 set @my_max_connect_errors =@@global.max_connect_errors;
4690+set @my_max_connections =@@global.max_connections;
4691 set @my_max_delayed_threads =@@global.max_delayed_threads;
4692 set @my_max_heap_table_size =@@global.max_heap_table_size;
4693 set @my_max_insert_delayed_threads=@@global.max_insert_delayed_threads;
4694 set @my_max_join_size =@@global.max_join_size;
4695-set @my_max_user_connections =@@global.max_user_connections;
4696-set @my_max_write_lock_count =@@global.max_write_lock_count;
4697 set @my_myisam_data_pointer_size =@@global.myisam_data_pointer_size;
4698+set @my_myisam_max_sort_file_size =@@global.myisam_max_sort_file_size;
4699 set @my_net_buffer_length =@@global.net_buffer_length;
4700 set @my_net_write_timeout =@@global.net_write_timeout;
4701 set @my_net_read_timeout =@@global.net_read_timeout;
4702@@ -35,7 +35,8 @@
4703 set @my_slow_launch_time =@@global.slow_launch_time;
4704 set @my_storage_engine =@@global.storage_engine;
4705 set @my_thread_cache_size =@@global.thread_cache_size;
4706-
4707+set @my_max_allowed_packet =@@global.max_allowed_packet;
4708+set @my_join_buffer_size =@@global.join_buffer_size;
4709 # case insensitivity tests (new in 5.0)
4710 set @`test`=1;
4711 select @test, @`test`, @TEST, @`TEST`, @"teSt";
4712@@ -142,29 +143,28 @@
4713 show global variables like 'myisam_max_sort_file_size';
4714 select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size';
4715 set GLOBAL myisam_max_sort_file_size=default;
4716---replace_result 2147483647 FILE_SIZE 9223372036854775807 FILE_SIZE
4717-show variables like 'myisam_max_sort_file_size';
4718---replace_result 2147483647 FILE_SIZE 9223372036854775807 FILE_SIZE
4719-select * from information_schema.session_variables where variable_name like 'myisam_max_sort_file_size';
4720+--replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE
4721+show global variables like 'myisam_max_sort_file_size';
4722+--replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE
4723+select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size';
4724
4725+# bug#22891: modified to take read-only SESSION net_buffer_length into account
4726 set global net_retry_count=10, session net_retry_count=10;
4727 set global net_buffer_length=1024, net_write_timeout=200, net_read_timeout=300;
4728-set session net_buffer_length=2048, net_write_timeout=500, net_read_timeout=600;
4729-show global variables like 'net_%';
4730-select * from information_schema.global_variables where variable_name like 'net_%' order by variable_name;
4731-show session variables like 'net_%';
4732-select * from information_schema.session_variables where variable_name like 'net_%' order by variable_name;
4733-set session net_buffer_length=8000, global net_read_timeout=900, net_write_timeout=1000;
4734-show global variables like 'net_%';
4735-select * from information_schema.global_variables where variable_name like 'net_%' order by variable_name;
4736-show session variables like 'net_%';
4737-select * from information_schema.session_variables where variable_name like 'net_%' order by variable_name;
4738-set net_buffer_length=1;
4739-show variables like 'net_buffer_length';
4740-select * from information_schema.session_variables where variable_name like 'net_buffer_length';
4741-set net_buffer_length=2000000000;
4742-show variables like 'net_buffer_length';
4743-select * from information_schema.session_variables where variable_name like 'net_buffer_length';
4744+show global variables like 'net_%';
4745+select * from information_schema.global_variables where variable_name like 'net_%' order by 1;
4746+show session variables like 'net_%';
4747+select * from information_schema.session_variables where variable_name like 'net_%' order by 1;
4748+set global net_buffer_length=8000, global net_read_timeout=900, net_write_timeout=1000;
4749+show global variables like 'net_%';
4750+select * from information_schema.global_variables where variable_name like 'net_%' order by 1;
4751+set global net_buffer_length=1;
4752+show global variables like 'net_buffer_length';
4753+select * from information_schema.global_variables where variable_name like 'net_buffer_length';
4754+#warning 1292
4755+set global net_buffer_length=2000000000;
4756+show global variables like 'net_buffer_length';
4757+select * from information_schema.global_variables where variable_name like 'net_buffer_length';
4758
4759 set character set cp1251_koi8;
4760 show variables like "character_set_client";
4761@@ -174,21 +174,63 @@
4762 set @@rand_seed1=10000000,@@rand_seed2=1000000;
4763 select ROUND(RAND(),5);
4764
4765-show variables like '%alloc%';
4766-select * from information_schema.session_variables where variable_name like '%alloc%' order by variable_name;
4767-set @@range_alloc_block_size=1024*16;
4768+
4769+--echo
4770+--echo ==+ Testing %alloc% system variables +==
4771+--echo ==+ NOTE: These values *must* be a multiple of 1024 +==
4772+--echo ==+ Other values will be rounded down to nearest multiple +==
4773+--echo
4774+--echo ==+ Show initial values +==
4775+SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
4776+'query_alloc_block_size', 'query_prealloc_size',
4777+'transaction_alloc_block_size', 'transaction_prealloc_size');
4778+
4779+--echo ==+ information_schema data +==
4780+SELECT * FROM information_schema.session_variables
4781+WHERE variable_name IN ('range_alloc_block_size',
4782+'query_alloc_block_size', 'query_prealloc_size',
4783+'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1;
4784+--echo Testing values that are multiples of 1024
4785+set @@range_alloc_block_size=1024*15+1024;
4786+set @@query_alloc_block_size=1024*15+1024*2;
4787+set @@query_prealloc_size=1024*18-1024;
4788+set @@transaction_alloc_block_size=1024*21-1024*1;
4789+set @@transaction_prealloc_size=1024*21-2048;
4790+--echo ==+ Check manipulated values ==+
4791+select @@query_alloc_block_size;
4792+SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
4793+'query_alloc_block_size', 'query_prealloc_size',
4794+'transaction_alloc_block_size', 'transaction_prealloc_size');
4795+--echo ==+ information_schema data +==
4796+SELECT * FROM information_schema.session_variables
4797+WHERE variable_name IN ('range_alloc_block_size',
4798+'query_alloc_block_size', 'query_prealloc_size',
4799+'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1;
4800+--echo ==+ Manipulate variable values +==
4801+--echo Testing values that are not 1024 multiples
4802+set @@range_alloc_block_size=1024*16+1023;
4803 set @@query_alloc_block_size=1024*17+2;
4804-set @@query_prealloc_size=1024*18;
4805+set @@query_prealloc_size=1024*18-1023;
4806 set @@transaction_alloc_block_size=1024*20-1;
4807 set @@transaction_prealloc_size=1024*21-1;
4808 select @@query_alloc_block_size;
4809-show variables like '%alloc%';
4810-select * from information_schema.session_variables where variable_name like '%alloc%' order by variable_name;
4811+--echo ==+ Check manipulated values ==+
4812+SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
4813+'query_alloc_block_size', 'query_prealloc_size',
4814+'transaction_alloc_block_size', 'transaction_prealloc_size');
4815+--echo ==+ information_schema data +==
4816+SELECT * FROM information_schema.session_variables
4817+WHERE variable_name IN ('range_alloc_block_size',
4818+'query_alloc_block_size', 'query_prealloc_size',
4819+'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1;
4820+--echo ==+ Set values back to the default values +==
4821 set @@range_alloc_block_size=default;
4822 set @@query_alloc_block_size=default, @@query_prealloc_size=default;
4823 set transaction_alloc_block_size=default, @@transaction_prealloc_size=default;
4824-show variables like '%alloc%';
4825-select * from information_schema.session_variables where variable_name like '%alloc%' order by variable_name;
4826+--echo ==+ Check the values now that they are reset +==
4827+SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
4828+'query_alloc_block_size', 'query_prealloc_size',
4829+'transaction_alloc_block_size', 'transaction_prealloc_size');
4830
4831 #
4832 # Bug #10904 Illegal mix of collations between
4833@@ -199,46 +241,46 @@
4834
4835 # The following should give errors
4836
4837---error 1231
4838+--error ER_WRONG_VALUE_FOR_VAR
4839 set big_tables=OFFF;
4840---error 1231
4841+--error ER_WRONG_VALUE_FOR_VAR
4842 set big_tables="OFFF";
4843---error 1193
4844+--error ER_UNKNOWN_SYSTEM_VARIABLE
4845 set unknown_variable=1;
4846---error 1232
4847+--error ER_WRONG_TYPE_FOR_VAR
4848 set max_join_size="hello";
4849---error 1286
4850+--error ER_UNKNOWN_STORAGE_ENGINE
4851 set storage_engine=UNKNOWN_TABLE_TYPE;
4852---error 1231
4853+--error ER_WRONG_VALUE_FOR_VAR
4854 set storage_engine=MERGE, big_tables=2;
4855 show local variables like 'storage_engine';
4856---error 1229
4857+--error ER_GLOBAL_VARIABLE
4858 set SESSION query_cache_size=10000;
4859---error 1230
4860+--error ER_NO_DEFAULT
4861 set GLOBAL storage_engine=DEFAULT;
4862---error 1115
4863+--error ER_UNKNOWN_CHARACTER_SET
4864 set character_set_client=UNKNOWN_CHARACTER_SET;
4865---error 1273
4866+--error ER_UNKNOWN_COLLATION
4867 set collation_connection=UNKNOWN_COLLATION;
4868---error 1231
4869+--error ER_WRONG_VALUE_FOR_VAR
4870 set character_set_client=NULL;
4871---error 1231
4872+--error ER_WRONG_VALUE_FOR_VAR
4873 set collation_connection=NULL;
4874---error 1228
4875+--error ER_LOCAL_VARIABLE
4876 set global autocommit=1;
4877---error 1238
4878+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
4879 select @@global.timestamp;
4880---error 1238
4881+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
4882 set @@version='';
4883---error 1229
4884+--error ER_GLOBAL_VARIABLE
4885 set @@concurrent_insert=1;
4886---error 1228
4887+--error ER_LOCAL_VARIABLE
4888 set @@global.sql_auto_is_null=1;
4889---error 1238
4890+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
4891 select @@global.sql_auto_is_null;
4892---error 1229
4893+--error ER_GLOBAL_VARIABLE
4894 set myisam_max_sort_file_size=100;
4895---error 1231
4896+--error ER_WRONG_VALUE_FOR_VAR
4897 set @@SQL_WARNINGS=NULL;
4898
4899 # Test setting all variables
4900@@ -269,9 +311,12 @@
4901 set join_buffer_size=100;
4902 set last_insert_id=1;
4903 set global local_infile=1;
4904-set long_query_time=100;
4905+set long_query_time=0.000001;
4906+select @@long_query_time;
4907+set long_query_time=100.000001;
4908+select @@long_query_time;
4909 set low_priority_updates=1;
4910-set max_allowed_packet=100;
4911+set global max_allowed_packet=100;
4912 set global max_binlog_cache_size=100;
4913 set global max_binlog_size=100;
4914 set global max_connect_errors=100;
4915@@ -285,7 +330,7 @@
4916 select @@max_user_connections;
4917 set global max_write_lock_count=100;
4918 set myisam_sort_buffer_size=100;
4919-set net_buffer_length=100;
4920+set global net_buffer_length=100;
4921 set net_read_timeout=100;
4922 set net_write_timeout=100;
4923 set global query_cache_limit=100;
4924@@ -328,6 +373,7 @@
4925 set tx_isolation="READ-COMMITTED";
4926 set wait_timeout=100;
4927 set log_warnings=1;
4928+set global log_warnings=1;
4929
4930 #
4931 # Bugs: #20392: INSERT_ID session variable has weird value
4932@@ -365,23 +411,23 @@
4933 # error conditions
4934 #
4935
4936---error 1193
4937+--error ER_UNKNOWN_SYSTEM_VARIABLE
4938 select @@xxxxxxxxxx;
4939 select 1;
4940
4941---error 1238
4942+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
4943 select @@session.key_buffer_size;
4944
4945---error 1229
4946+--error ER_GLOBAL_VARIABLE
4947 set ft_boolean_syntax = @@init_connect;
4948---error 1231
4949+--error ER_WRONG_VALUE_FOR_VAR
4950 set global ft_boolean_syntax = @@init_connect;
4951---error 1229
4952+--error ER_GLOBAL_VARIABLE
4953 set init_connect = NULL;
4954 set global init_connect = NULL;
4955---error 1229
4956+--error ER_GLOBAL_VARIABLE
4957 set ft_boolean_syntax = @@init_connect;
4958---error 1231
4959+--error ER_WRONG_VALUE_FOR_VAR
4960 set global ft_boolean_syntax = @@init_connect;
4961
4962 # Bug#3754 SET GLOBAL myisam_max_sort_file_size doesn't work as
4963@@ -414,15 +460,15 @@
4964 #
4965 # Bug#2586:Disallow global/session/local as structured var. instance names
4966 #
4967---error 1064
4968+--error ER_PARSE_ERROR
4969 set @@global.global.key_buffer_size= 1;
4970---error 1064
4971+--error ER_PARSE_ERROR
4972 set GLOBAL global.key_buffer_size= 1;
4973---error 1064
4974+--error ER_PARSE_ERROR
4975 SELECT @@global.global.key_buffer_size;
4976---error 1064
4977+--error ER_PARSE_ERROR
4978 SELECT @@global.session.key_buffer_size;
4979---error 1064
4980+--error ER_PARSE_ERROR
4981 SELECT @@global.local.key_buffer_size;
4982
4983 # BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0)
4984@@ -513,27 +559,27 @@
4985 --echo *** LC_TIME_NAMES: testing with string expressions
4986 set lc_time_names=concat('de','_','DE');
4987 select @@lc_time_names;
4988---error 1105
4989+--error ER_UNKNOWN_ERROR
4990 set lc_time_names=concat('de','+','DE');
4991 select @@lc_time_names;
4992 --echo LC_TIME_NAMES: testing with numeric expressions
4993 set @@lc_time_names=1+2;
4994 select @@lc_time_names;
4995---error 1232
4996+--error ER_WRONG_TYPE_FOR_VAR
4997 set @@lc_time_names=1/0;
4998 select @@lc_time_names;
4999 set lc_time_names=en_US;
5000 --echo LC_TIME_NAMES: testing NULL and a negative number:
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches