Skip to content

Commit ec9f4c7

Browse files
author
Luis Soares
committed
Automerge from mysql-next-mr-bugfixing.
2 parents 017b8df + af67056 commit ec9f4c7

File tree

98 files changed

+1174
-1947
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1174
-1947
lines changed

‎.bzr-mysql/default.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[MYSQL]
22
post_commit_to = "[email protected]"
33
post_push_to = "[email protected]"
4-
tree_name = "mysql-5.5-next-mr"
4+
tree_name = "mysql-5.1-rpl-merge"

‎include/mysql/psi/psi.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2008-2009 Sun Microsystems, Inc
1+
/* Copyright (C) 2008-2010 Sun Microsystems, Inc
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -614,6 +614,9 @@ typedef void (*set_thread_v1_t)(struct PSI_thread *thread);
614614
/** Delete the current thread instrumentation. */
615615
typedef void (*delete_current_thread_v1_t)(void);
616616

617+
/** Delete a thread instrumentation. */
618+
typedef void (*delete_thread_v1_t)(struct PSI_thread *thread);
619+
617620
/**
618621
Get a mutex instrumentation locker.
619622
@param mutex the instrumented mutex to lock
@@ -890,6 +893,8 @@ struct PSI_v1
890893
set_thread_v1_t set_thread;
891894
/** @sa delete_current_thread_v1_t. */
892895
delete_current_thread_v1_t delete_current_thread;
896+
/** @sa delete_thread_v1_t. */
897+
delete_thread_v1_t delete_thread;
893898
/** @sa get_thread_mutex_locker_v1_t. */
894899
get_thread_mutex_locker_v1_t get_thread_mutex_locker;
895900
/** @sa get_thread_rwlock_locker_v1_t. */

‎include/mysql/psi/psi_abi_v1.h.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
typedef struct PSI_thread* (*get_thread_v1_t)(void);
128128
typedef void (*set_thread_v1_t)(struct PSI_thread *thread);
129129
typedef void (*delete_current_thread_v1_t)(void);
130+
typedef void (*delete_thread_v1_t)(struct PSI_thread *thread);
130131
typedef struct PSI_mutex_locker* (*get_thread_mutex_locker_v1_t)
131132
(struct PSI_mutex *mutex, enum PSI_mutex_operation op);
132133
typedef struct PSI_rwlock_locker* (*get_thread_rwlock_locker_v1_t)
@@ -204,6 +205,7 @@
204205
get_thread_v1_t get_thread;
205206
set_thread_v1_t set_thread;
206207
delete_current_thread_v1_t delete_current_thread;
208+
delete_thread_v1_t delete_thread;
207209
get_thread_mutex_locker_v1_t get_thread_mutex_locker;
208210
get_thread_rwlock_locker_v1_t get_thread_rwlock_locker;
209211
get_thread_cond_locker_v1_t get_thread_cond_locker;

‎mysql-test/collections/default.experimental

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ main.plugin # Bug#47146 Linking problem with exampl
1616
main.signal_demo3 @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
1717
main.sp @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
1818

19-
perfschema.tampered_perfschema_table1 @windows # Bug#50478 2010-01-20 alik perfschema.tampered_perfschema_table1 fails sporadically on Windows and Solaris
20-
perfschema.tampered_perfschema_table1 @solaris # Bug#50478 2010-01-20 alik perfschema.tampered_perfschema_table1 fails sporadically on Windows and Solaris
21-
2219
rpl.rpl_heartbeat_basic # BUG#43828 2009-10-22 luis fails sporadically
2320
rpl.rpl_heartbeat_2slaves # BUG#43828 2009-10-22 luis fails sporadically
2421
rpl.rpl_innodb_bug28430* # Bug#46029
@@ -29,7 +26,6 @@ rpl.rpl_row_sp011* @solaris # Bug#47791 2010-01-20 alik Several tes
2926
rpl.rpl_timezone* # Bug#47017 2009-10-27 alik rpl_timezone fails on PB-2 with mismatch error
3027

3128
sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
32-
sys_vars.delayed_insert_limit_func # Bug#50435 2010-01-25 alik sys_vars.delayed_insert_limit_func fails on Ubuntu x86_64 in debug mode
3329

3430
# Declare all NDB-tests in ndb and rpl_ndb test suites experimental.
3531
# Usually the test cases from ndb and rpl_ndb test suites are not run in PB,

‎mysql-test/include/have_ipv4_mapped.inc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Check if ipv4 mapped to ipv6 is available.
2+
--disable_query_log
3+
--disable_abort_on_error
4+
connect (checkcon123456789,::FFFF:127.0.0.1,root,,test);
5+
if($mysql_errno)
6+
{
7+
skip wrong IP;
8+
}
9+
connection default;
10+
disconnect checkcon123456789;
11+
--enable_abort_on_error
12+
--enable_query_log
13+
# end check
14+

‎mysql-test/include/ipv6.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ eval SET @nip= inet_aton('$IPv6');
66
SELECT @nip;
77
SELECT inet_ntoa(@nip);
88
# delivers a wrong value, see bug#34037
9+
--replace_result ::1 localhost
910
SELECT USER();
11+
--replace_result ::1 localhost
1012
SELECT current_user();
1113
--disable_result_log
1214
SHOW PROCESSLIST;
@@ -17,6 +19,7 @@ disconnect con1;
1719
eval REVOKE ALL ON test.* FROM testuser@'$IPv6';
1820
eval RENAME USER testuser@'$IPv6' to testuser1@'$IPv6';
1921
eval SET PASSWORD FOR testuser1@'$IPv6' = PASSWORD ('9876');
22+
--replace_result ::1 localhost
2023
SELECT USER();
2124
eval DROP USER testuser1@'$IPv6';
2225

‎mysql-test/r/constraints.result

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ create table t1 (a int check (a>0));
33
insert into t1 values (1);
44
insert into t1 values (0);
55
drop table t1;
6-
create table t1 (a int ,b int, check a>b);
6+
create table t1 (a int, b int, check (a>b));
77
insert into t1 values (1,0);
88
insert into t1 values (0,1);
99
drop table t1;
@@ -27,3 +27,19 @@ t1 CREATE TABLE `t1` (
2727
UNIQUE KEY `key_2` (`a`)
2828
) ENGINE=MyISAM DEFAULT CHARSET=latin1
2929
drop table t1;
30+
drop table if exists t_illegal;
31+
create table t_illegal (a int, b int, check a>b);
32+
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 'a>b)' at line 1
33+
create table t_illegal (a int, b int, constraint abc check a>b);
34+
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 'a>b)' at line 1
35+
create table t_illegal (a int, b int, constraint abc);
36+
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
37+
drop table if exists t_11714;
38+
create table t_11714(a int, b int);
39+
alter table t_11714 add constraint cons1;
40+
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
41+
drop table t_11714;
42+
CREATE TABLE t_illegal (col_1 INT CHECK something (whatever));
43+
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 'something (whatever))' at line 1
44+
CREATE TABLE t_illegal (col_1 INT CHECK something);
45+
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 'something)' at line 1

‎mysql-test/r/foreign_key.result

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,45 @@ foreign key (a,b) references t3 (c,d) on update set null);
1313
create index a on t1 (a);
1414
create unique index b on t1 (a,b);
1515
drop table t1;
16+
drop table if exists t_34455;
17+
create table t_34455 (
18+
a int not null,
19+
foreign key (a) references t3 (a) match full match partial);
20+
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 'match partial)' at line 3
21+
create table t_34455 (
22+
a int not null,
23+
foreign key (a) references t3 (a) on delete set default match full);
24+
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 'match full)' at line 3
25+
create table t_34455 (
26+
a int not null,
27+
foreign key (a) references t3 (a) on update set default match full);
28+
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 'match full)' at line 3
29+
create table t_34455 (
30+
a int not null,
31+
foreign key (a) references t3 (a)
32+
on delete set default on delete set default);
33+
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 'delete set default)' at line 4
34+
create table t_34455 (
35+
a int not null,
36+
foreign key (a) references t3 (a)
37+
on update set default on update set default);
38+
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 'update set default)' at line 4
39+
create table t_34455 (a int not null);
40+
alter table t_34455
41+
add foreign key (a) references t3 (a) match full match partial);
42+
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 'match partial)' at line 2
43+
alter table t_34455
44+
add foreign key (a) references t3 (a) on delete set default match full);
45+
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 'match full)' at line 2
46+
alter table t_34455
47+
add foreign key (a) references t3 (a) on update set default match full);
48+
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 'match full)' at line 2
49+
alter table t_34455
50+
add foreign key (a) references t3 (a)
51+
on delete set default on delete set default);
52+
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 'delete set default)' at line 3
53+
alter table t_34455
54+
add foreign key (a) references t3 (a)
55+
on update set default on update set default);
56+
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 'update set default)' at line 3
57+
drop table t_34455;

‎mysql-test/r/ipv4_as_ipv6_win.result

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎mysql-test/r/ipv6.result

Lines changed: 0 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -86,179 +86,3 @@ SELECT USER();
8686
USER()
8787
root@localhost
8888
DROP USER testuser1@'0:0:0:0:0:0:0:1';
89-
=============Test of '127.0.0.1' (IPv4) ===========================
90-
mysqld is alive
91-
CREATE USER testuser@'127.0.0.1' identified by '1234';
92-
GRANT ALL ON test.* TO testuser@'127.0.0.1';
93-
SHOW GRANTS FOR testuser@'127.0.0.1';
94-
Grants for [email protected]
95-
GRANT USAGE ON *.* TO 'testuser'@'127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF'
96-
GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'127.0.0.1'
97-
SET @nip= inet_aton('127.0.0.1');
98-
SELECT @nip;
99-
@nip
100-
2130706433
101-
SELECT inet_ntoa(@nip);
102-
inet_ntoa(@nip)
103-
127.0.0.1
104-
SELECT USER();
105-
USER()
106-
root@localhost
107-
SELECT current_user();
108-
current_user()
109-
root@localhost
110-
SHOW PROCESSLIST;
111-
REVOKE ALL ON test.* FROM testuser@'127.0.0.1';
112-
RENAME USER testuser@'127.0.0.1' to testuser1@'127.0.0.1';
113-
SET PASSWORD FOR testuser1@'127.0.0.1' = PASSWORD ('9876');
114-
SELECT USER();
115-
USER()
116-
root@localhost
117-
DROP USER testuser1@'127.0.0.1';
118-
=============Test of '0:0:0:0:0:FFFF:127.0.0.1' ===================
119-
mysqld is alive
120-
CREATE USER testuser@'0:0:0:0:0:FFFF:127.0.0.1' identified by '1234';
121-
GRANT ALL ON test.* TO testuser@'0:0:0:0:0:FFFF:127.0.0.1';
122-
SHOW GRANTS FOR testuser@'0:0:0:0:0:FFFF:127.0.0.1';
123-
Grants for testuser@0:0:0:0:0:FFFF:127.0.0.1
124-
GRANT USAGE ON *.* TO 'testuser'@'0:0:0:0:0:FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF'
125-
GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0:0:0:0:0:FFFF:127.0.0.1'
126-
SET @nip= inet_aton('0:0:0:0:0:FFFF:127.0.0.1');
127-
SELECT @nip;
128-
@nip
129-
NULL
130-
SELECT inet_ntoa(@nip);
131-
inet_ntoa(@nip)
132-
NULL
133-
SELECT USER();
134-
USER()
135-
root@localhost
136-
SELECT current_user();
137-
current_user()
138-
root@localhost
139-
SHOW PROCESSLIST;
140-
REVOKE ALL ON test.* FROM testuser@'0:0:0:0:0:FFFF:127.0.0.1';
141-
RENAME USER testuser@'0:0:0:0:0:FFFF:127.0.0.1' to testuser1@'0:0:0:0:0:FFFF:127.0.0.1';
142-
SET PASSWORD FOR testuser1@'0:0:0:0:0:FFFF:127.0.0.1' = PASSWORD ('9876');
143-
SELECT USER();
144-
USER()
145-
root@localhost
146-
DROP USER testuser1@'0:0:0:0:0:FFFF:127.0.0.1';
147-
=============Test of '0000:0000:0000:0000:0000:FFFF:127.0.0.1' ====
148-
mysqld is alive
149-
CREATE USER testuser@'0000:0000:0000:0000:0000:FFFF:127.0.0.1' identified by '1234';
150-
GRANT ALL ON test.* TO testuser@'0000:0000:0000:0000:0000:FFFF:127.0.0.1';
151-
SHOW GRANTS FOR testuser@'0000:0000:0000:0000:0000:FFFF:127.0.0.1';
152-
Grants for testuser@0000:0000:0000:0000:0000:FFFF:127.0.0.1
153-
GRANT USAGE ON *.* TO 'testuser'@'0000:0000:0000:0000:0000:FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF'
154-
GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0000:0000:0000:0000:0000:FFFF:127.0.0.1'
155-
SET @nip= inet_aton('0000:0000:0000:0000:0000:FFFF:127.0.0.1');
156-
SELECT @nip;
157-
@nip
158-
NULL
159-
SELECT inet_ntoa(@nip);
160-
inet_ntoa(@nip)
161-
NULL
162-
SELECT USER();
163-
USER()
164-
root@localhost
165-
SELECT current_user();
166-
current_user()
167-
root@localhost
168-
SHOW PROCESSLIST;
169-
REVOKE ALL ON test.* FROM testuser@'0000:0000:0000:0000:0000:FFFF:127.0.0.1';
170-
RENAME USER testuser@'0000:0000:0000:0000:0000:FFFF:127.0.0.1' to testuser1@'0000:0000:0000:0000:0000:FFFF:127.0.0.1';
171-
SET PASSWORD FOR testuser1@'0000:0000:0000:0000:0000:FFFF:127.0.0.1' = PASSWORD ('9876');
172-
SELECT USER();
173-
USER()
174-
root@localhost
175-
DROP USER testuser1@'0000:0000:0000:0000:0000:FFFF:127.0.0.1';
176-
=============Test of '0:0000:0000:0:0000:FFFF:127.0.0.1' ====
177-
mysqld is alive
178-
CREATE USER testuser@'0:0000:0000:0:0000:FFFF:127.0.0.1' identified by '1234';
179-
GRANT ALL ON test.* TO testuser@'0:0000:0000:0:0000:FFFF:127.0.0.1';
180-
SHOW GRANTS FOR testuser@'0:0000:0000:0:0000:FFFF:127.0.0.1';
181-
Grants for testuser@0:0000:0000:0:0000:FFFF:127.0.0.1
182-
GRANT USAGE ON *.* TO 'testuser'@'0:0000:0000:0:0000:FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF'
183-
GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0:0000:0000:0:0000:FFFF:127.0.0.1'
184-
SET @nip= inet_aton('0:0000:0000:0:0000:FFFF:127.0.0.1');
185-
SELECT @nip;
186-
@nip
187-
NULL
188-
SELECT inet_ntoa(@nip);
189-
inet_ntoa(@nip)
190-
NULL
191-
SELECT USER();
192-
USER()
193-
root@localhost
194-
SELECT current_user();
195-
current_user()
196-
root@localhost
197-
SHOW PROCESSLIST;
198-
REVOKE ALL ON test.* FROM testuser@'0:0000:0000:0:0000:FFFF:127.0.0.1';
199-
RENAME USER testuser@'0:0000:0000:0:0000:FFFF:127.0.0.1' to testuser1@'0:0000:0000:0:0000:FFFF:127.0.0.1';
200-
SET PASSWORD FOR testuser1@'0:0000:0000:0:0000:FFFF:127.0.0.1' = PASSWORD ('9876');
201-
SELECT USER();
202-
USER()
203-
root@localhost
204-
DROP USER testuser1@'0:0000:0000:0:0000:FFFF:127.0.0.1';
205-
=============Test of '0::0000:FFFF:127.0.0.1' ====
206-
mysqld is alive
207-
CREATE USER testuser@'0::0000:FFFF:127.0.0.1' identified by '1234';
208-
GRANT ALL ON test.* TO testuser@'0::0000:FFFF:127.0.0.1';
209-
SHOW GRANTS FOR testuser@'0::0000:FFFF:127.0.0.1';
210-
Grants for testuser@0::0000:FFFF:127.0.0.1
211-
GRANT USAGE ON *.* TO 'testuser'@'0::0000:FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF'
212-
GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'0::0000:FFFF:127.0.0.1'
213-
SET @nip= inet_aton('0::0000:FFFF:127.0.0.1');
214-
SELECT @nip;
215-
@nip
216-
NULL
217-
SELECT inet_ntoa(@nip);
218-
inet_ntoa(@nip)
219-
NULL
220-
SELECT USER();
221-
USER()
222-
root@localhost
223-
SELECT current_user();
224-
current_user()
225-
root@localhost
226-
SHOW PROCESSLIST;
227-
REVOKE ALL ON test.* FROM testuser@'0::0000:FFFF:127.0.0.1';
228-
RENAME USER testuser@'0::0000:FFFF:127.0.0.1' to testuser1@'0::0000:FFFF:127.0.0.1';
229-
SET PASSWORD FOR testuser1@'0::0000:FFFF:127.0.0.1' = PASSWORD ('9876');
230-
SELECT USER();
231-
USER()
232-
root@localhost
233-
DROP USER testuser1@'0::0000:FFFF:127.0.0.1';
234-
=============Test of '0:0:0:0:0:FFFF:127.0.0.1/96' ================
235-
=============Test of '::FFFF:127.0.0.1' ===========================
236-
mysqld is alive
237-
CREATE USER testuser@'::FFFF:127.0.0.1' identified by '1234';
238-
GRANT ALL ON test.* TO testuser@'::FFFF:127.0.0.1';
239-
SHOW GRANTS FOR testuser@'::FFFF:127.0.0.1';
240-
Grants for testuser@::FFFF:127.0.0.1
241-
GRANT USAGE ON *.* TO 'testuser'@'::FFFF:127.0.0.1' IDENTIFIED BY PASSWORD '*A4B6157319038724E3560894F7F932C8886EBFCF'
242-
GRANT ALL PRIVILEGES ON `test`.* TO 'testuser'@'::FFFF:127.0.0.1'
243-
SET @nip= inet_aton('::FFFF:127.0.0.1');
244-
SELECT @nip;
245-
@nip
246-
NULL
247-
SELECT inet_ntoa(@nip);
248-
inet_ntoa(@nip)
249-
NULL
250-
SELECT USER();
251-
USER()
252-
root@localhost
253-
SELECT current_user();
254-
current_user()
255-
root@localhost
256-
SHOW PROCESSLIST;
257-
REVOKE ALL ON test.* FROM testuser@'::FFFF:127.0.0.1';
258-
RENAME USER testuser@'::FFFF:127.0.0.1' to testuser1@'::FFFF:127.0.0.1';
259-
SET PASSWORD FOR testuser1@'::FFFF:127.0.0.1' = PASSWORD ('9876');
260-
SELECT USER();
261-
USER()
262-
root@localhost
263-
DROP USER testuser1@'::FFFF:127.0.0.1';
264-
=============Test of '::FFFF:127.0.0.1/96' ========================

0 commit comments

Comments
 (0)