Skip to content

M
MariaDB
Commit ba4a5e8c authored by Alfranio Correia's avatar Alfranio Correia
Browse files
Options

merge 5.1-bugteam --> 5.1-bugteam (local)

parents 23d032c3 2cb3874a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 658 additions and 404 deletions
client/mysql.cc
View file @ ba4a5e8c
...@@ -2044,7 +2044,8 @@ static bool add_line(String &buffer,char *line,char *in_string, ...@@ -2044,7 +2044,8 @@ static bool add_line(String &buffer,char *line,char *in_string,
} }
#endif #endif
if (!*ml_comment && inchar == '\\' && if (!*ml_comment && inchar == '\\' &&
!(mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)) !(*in_string &&
(mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)))
{ {
// Found possbile one character command like \c // Found possbile one character command like \c
......
mysql-test/include/setup_fake_relay_log.inc
View file @ ba4a5e8c
...@@ -68,9 +68,8 @@ let $_fake_relay_log_purge= `SELECT @@global.relay_log_purge`; ...@@ -68,9 +68,8 @@ let $_fake_relay_log_purge= `SELECT @@global.relay_log_purge`;
# Create relay log file. # Create relay log file.
copy_file $fake_relay_log $_fake_relay_log; copy_file $fake_relay_log $_fake_relay_log;
# Create relay log index. # Create relay log index.
eval SELECT '$_fake_relay_log' INTO OUTFILE '$_fake_relay_index'; --exec echo $_fake_relay_log > $_fake_relay_index
# Setup replication from existing relay log. # Setup replication from existing relay log.
eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='$_fake_relay_log', RELAY_LOG_POS=4; eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='$_fake_relay_log', RELAY_LOG_POS=4;
......
mysql-test/r/openssl_1.result
View file @ ba4a5e8c
...@@ -3,8 +3,8 @@ create table t1(f1 int); ...@@ -3,8 +3,8 @@ create table t1(f1 int);
insert into t1 values (5); insert into t1 values (5);
grant select on test.* to ssl_user1@localhost require SSL; grant select on test.* to ssl_user1@localhost require SSL;
grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA"; grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com"; grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com";
grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx"; grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
flush privileges; flush privileges;
connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET); connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);
......
mysql-test/r/query_cache_notembedded.result
View file @ ba4a5e8c
...@@ -346,22 +346,6 @@ id ...@@ -346,22 +346,6 @@ id
drop table t1; drop table t1;
drop function f1; drop function f1;
set GLOBAL query_cache_size=0; set GLOBAL query_cache_size=0;
DROP TABLE IF EXISTS t1;
FLUSH STATUS;
SET GLOBAL query_cache_size=1048576;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
SHOW STATUS LIKE 'Qcache_queries_in_cache';
Variable_name Value
Qcache_queries_in_cache 0
LOCK TABLES t1 WRITE;
SELECT * FROM t1;
UNLOCK TABLES;
SHOW STATUS LIKE 'Qcache_queries_in_cache';
Variable_name Value
Qcache_queries_in_cache 0
DROP TABLE t1;
SET GLOBAL query_cache_size= default;
SET GLOBAL log_bin_trust_function_creators = 0; SET GLOBAL log_bin_trust_function_creators = 0;
DROP DATABASE IF EXISTS bug30269; DROP DATABASE IF EXISTS bug30269;
FLUSH STATUS; FLUSH STATUS;
......
mysql-test/r/subselect.result
View file @ ba4a5e8c
...@@ -4478,4 +4478,40 @@ WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION; ...@@ -4478,4 +4478,40 @@ WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
DELETE FROM v3; DELETE FROM v3;
DROP VIEW v1,v2,v3; DROP VIEW v1,v2,v3;
DROP TABLE t1,t2; DROP TABLE t1,t2;
#
# BUG#37822: Correlated subquery with IN and IS UNKNOWN provides wrong result
#
create table t1(id integer primary key, g integer, v integer, s char(1));
create table t2(id integer primary key, g integer, v integer, s char(1));
insert into t1 values
(10, 10, 10, 'l'),
(20, 20, 20, 'l'),
(40, 40, 40, 'l'),
(41, 40, null, 'l'),
(50, 50, 50, 'l'),
(51, 50, null, 'l'),
(60, 60, 60, 'l'),
(61, 60, null, 'l'),
(70, 70, 70, 'l'),
(90, 90, null, 'l');
insert into t2 values
(10, 10, 10, 'r'),
(30, 30, 30, 'r'),
(50, 50, 50, 'r'),
(60, 60, 60, 'r'),
(61, 60, null, 'r'),
(70, 70, 70, 'r'),
(71, 70, null, 'r'),
(80, 80, 80, 'r'),
(81, 80, null, 'r'),
(100,100,null, 'r');
select *
from t1
where v in(select v
from t2
where t1.g=t2.g) is unknown;
id g v s
51 50 NULL l
61 60 NULL l
drop table t1, t2;
End of 5.1 tests. End of 5.1 tests.
mysql-test/r/subselect3.result
View file @ ba4a5e8c
...@@ -795,6 +795,60 @@ WHERE INNR.varchar_key > 'n{' ...@@ -795,6 +795,60 @@ WHERE INNR.varchar_key > 'n{'
); );
varchar_nokey varchar_nokey
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1), (2), (11);
# 2nd and 3rd columns should be same
SELECT a, ROW(11, 12) = (SELECT a, 22), ROW(11, 12) IN (SELECT a, 22) FROM t1 GROUP BY t1.a;
a ROW(11, 12) = (SELECT a, 22) ROW(11, 12) IN (SELECT a, 22)
1 0 0
2 0 0
11 0 0
SELECT a, ROW(11, 12) = (SELECT a, 12), ROW(11, 12) IN (SELECT a, 12) FROM t1 GROUP BY t1.a;
a ROW(11, 12) = (SELECT a, 12) ROW(11, 12) IN (SELECT a, 12)
1 0 0
2 0 0
11 1 1
SELECT a, ROW(11, 12) = (SELECT a, 22), ROW(11, 12) IN (SELECT a, 22) FROM t1;
a ROW(11, 12) = (SELECT a, 22) ROW(11, 12) IN (SELECT a, 22)
1 0 0
2 0 0
11 0 0
SELECT a, ROW(11, 12) = (SELECT a, 12), ROW(11, 12) IN (SELECT a, 12) FROM t1;
a ROW(11, 12) = (SELECT a, 12) ROW(11, 12) IN (SELECT a, 12)
1 0 0
2 0 0
11 1 1
SELECT a AS x, ROW(11, 12) = (SELECT MAX(x), 22), ROW(11, 12) IN (SELECT MAX(x), 22) FROM t1;
x ROW(11, 12) = (SELECT MAX(x), 22) ROW(11, 12) IN (SELECT MAX(x), 22)
1 0 0
2 0 0
11 0 0
# 2nd and 3rd columns should be same for x == 11 only
SELECT a AS x, ROW(11, 12) = (SELECT MAX(x), 12), ROW(11, 12) IN (SELECT MAX(x), 12) FROM t1;
x ROW(11, 12) = (SELECT MAX(x), 12) ROW(11, 12) IN (SELECT MAX(x), 12)
1 0 1
2 0 1
11 1 1
DROP TABLE t1;
# both columns should be same
SELECT ROW(1,2) = (SELECT NULL, NULL), ROW(1,2) IN (SELECT NULL, NULL);
ROW(1,2) = (SELECT NULL, NULL) ROW(1,2) IN (SELECT NULL, NULL)
NULL NULL
SELECT ROW(1,2) = (SELECT 1, NULL), ROW(1,2) IN (SELECT 1, NULL);
ROW(1,2) = (SELECT 1, NULL) ROW(1,2) IN (SELECT 1, NULL)
NULL NULL
SELECT ROW(1,2) = (SELECT NULL, 2), ROW(1,2) IN (SELECT NULL, 2);
ROW(1,2) = (SELECT NULL, 2) ROW(1,2) IN (SELECT NULL, 2)
NULL NULL
SELECT ROW(1,2) = (SELECT NULL, 1), ROW(1,2) IN (SELECT NULL, 1);
ROW(1,2) = (SELECT NULL, 1) ROW(1,2) IN (SELECT NULL, 1)
0 0
SELECT ROW(1,2) = (SELECT 1, 1), ROW(1,2) IN (SELECT 1, 1);
ROW(1,2) = (SELECT 1, 1) ROW(1,2) IN (SELECT 1, 1)
0 0
SELECT ROW(1,2) = (SELECT 1, 2), ROW(1,2) IN (SELECT 1, 2);
ROW(1,2) = (SELECT 1, 2) ROW(1,2) IN (SELECT 1, 2)
1 1
End of 5.0 tests End of 5.0 tests
create table t0 (a int); create table t0 (a int);
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
......
mysql-test/std_data/cacert.pem
View file @ ba4a5e8c
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIICrTCCAhagAwIBAgIJAIAO/Ybiptv1MA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV MIICrTCCAhagAwIBAgIJAJXpePU0UOTVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
VQQKEwhNeVNRTCBBQjAeFw0wNjA1MDMwODQ4NTRaFw0wOTAxMjcwODQ4NTRaMEQx VQQKEwhNeVNRTCBBQjAeFw0wOTAxMjgxMDQ5NDZaFw0xNDAxMjcxMDQ5NDZaMEQx
CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+C46EQl1u7tQ6gb9eqc8V079gr8YmDPCEqtjO8bCIbchpjOpDITx0WZz36Sn9E72 4XQHAe5R1+TXC8noZtWf+d5E0v1C59FWpn9SWEUCBjE5UiIwuJvi4Y+7xWGOXLAI
GPJwNip4FxLaPRIA3xNQHM5cE5U53qznlRx1Fc4O3hcWCvyCqNDl/vzPAh3pI6Bl /JzJx5gNXLBiTsE/zh0uX9fKlajLhxB0GN+QU0ZlpQ1BeYipEcNXeI/7cT499f6v
Ku9hfHXpp93W812smVPe9haShEXGgbEPYGzvOfVdu/MCAwEAAaOBpjCBozAdBgNV XWabnTflivdCgHSWUOQ20/Lzs6kP6/e6OoZd/DPSjPECAwEAAaOBpjCBozAdBgNV
HQ4EFgQUjIy/6OCTmqtPHBFha6/qzVk3yTcwdAYDVR0jBG0wa4AUjIy/6OCTmqtP HQ4EFgQU8uLqVWWkmuKsnZf1RWz294wRrd8wdAYDVR0jBG0wa4AU8uLqVWWkmuKs
HBFha6/qzVk3yTehSKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxh nZf1RWz294wRrd+hSKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxh
MRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAIAO/Ybiptv1 MRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTV
MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEA8lD9zyB820Oq1aj7ZafX MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMMTE5sDN+Z0ZlV7KvH3g
De/hbdt9RIl2tzgw2K3r1KZGdXJVL0vSt5fZ51Nq9lg7OPJy3iXf+caBJEp0IJpB 6+aKvql8dTpRT3hYukeQlWua0nq74WPGVw0c4e/M/vbiMwmJcCYpB9pd4+dHqzSw
uf4Gfr6zfXw+UlY6ZthRtHQHoXKcbskECjH5/ps/Uaa+dpVQ9O+Ii1rPzmgo6ztM aPyoenjY6UF8n7B4quWy3SIUk2LSHeJLW+kzJn2afN9gvipFhdVh/uU2TIyLGOur
s+xZ46ESBt4WiHXm8kwbU9Y= Z/vmJX2W7hF1uqPnbfa8Lrw=
-----END CERTIFICATE----- -----END CERTIFICATE-----
mysql-test/std_data/client-cert.pem
View file @ ba4a5e8c
Certificate: Certificate:
Data: Data:
Version: 1 (0x0) Version: 3 (0x2)
Serial Number: 1 (0x1) Serial Number: 3 (0x3)
Signature Algorithm: md5WithRSAEncryption Signature Algorithm: sha1WithRSAEncryption
Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
Validity Validity
Not Before: May 3 08:55:39 2006 GMT Not Before: Jan 28 11:04:39 2009 GMT
Not After : Jan 27 08:55:39 2009 GMT Not After : Jan 28 11:04:39 2010 GMT
Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com Subject: C=SE, ST=Uppsala, O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com
Subject Public Key Info: Subject Public Key Info:
Public Key Algorithm: rsaEncryption Public Key Algorithm: rsaEncryption
RSA Public Key: (512 bit) RSA Public Key: (512 bit)
Modulus (512 bit): Modulus (512 bit):
00:d8:db:68:28:49:84:4d:d6:0f:5c:bc:3d:9a:ab: 00:e1:52:30:2c:d9:be:64:28:91:5d:7a:fd:d9:e9:
70:d5:3e:f5:b5:17:ba:ef:e1:f8:87:54:30:22:1f: 14:35:7a:d2:94:4e:91:46:e0:db:9f:6b:79:f4:4c:
81:07:bf:f9:24:7f:8a:54:10:e9:5f:e6:99:50:04: ac:6e:07:61:34:86:74:62:a7:a8:44:af:fa:87:87:
d4:3b:55:a9:f1:52:ad:12:2b:5a:da:5c:be:8c:3e: a8:7d:42:61:ff:ab:50:d4:7b:bf:75:fa:d5:d5:b3:
5b:9e:b0:5a:19 74:fb:56:1e:37
Exponent: 65537 (0x10001) Exponent: 65537 (0x10001)
Signature Algorithm: md5WithRSAEncryption X509v3 extensions:
07:57:bf:07:92:c2:8e:86:24:6b:0a:bf:e5:31:21:44:c3:60: X509v3 Basic Constraints:
02:a6:ac:9e:f7:db:7a:6e:fc:4f:d4:7b:54:18:80:47:d2:4a: CA:FALSE
63:0e:e3:f8:af:6e:58:e3:97:5a:2b:82:5d:76:20:d1:33:a0: X509v3 Subject Key Identifier:
f5:43:a1:d1:51:f4:ca:c8:b3:1a:66:4e:0e:55:df:d2:e8:fa: 58:30:B5:9B:2C:05:94:06:BA:3D:3C:F0:B2:CD:1D:67:65:E3:7F:85
83:18:42:f5:ec:66:40:f0:39:e8:f9:d7:cf:f6:dd:e4:7b:69: X509v3 Authority Key Identifier:
dd:0c:92:d8:52:95:43:6f:29:3d:f0:8d:4c:dd:52:ea:6b:a0: keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF
39:0f:dc:59:a7:5c:37:6b:8b:05:44:b7:69:ea:a3:58:e0:4e: DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
ce:d6 serial:95:E9:78:F5:34:50:E4:D5
Signature Algorithm: sha1WithRSAEncryption
05:19:e3:13:14:fc:c5:28:bf:69:f8:00:b3:25:cb:bd:ca:9f:
2f:4c:b3:a8:04:11:f0:74:27:bd:82:2c:b4:49:9b:a7:59:f0:
f7:87:d1:e0:ba:99:a2:fe:4b:1d:10:6f:e4:a2:b3:cd:7f:8b:
68:31:46:ee:cd:9e:e2:47:e1:4c:fa:74:d1:e2:8b:cc:a0:4b:
a8:24:d1:a4:c3:6b:2a:c6:28:cd:41:e0:06:48:e6:cf:f2:3c:
ca:37:95:d7:29:64:6b:91:91:83:e7:ac:c8:0b:87:bc:da:a6:
aa:f1:44:43:c8:74:7b:15:26:91:2e:03:c4:71:50:6c:f8:68:
dc:8c
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIB5jCCAU8CAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV MIICfzCCAeigAwIBAgIBAzANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
MB4XDTA2MDUwMzA4NTUzOVoXDTA5MDEyNzA4NTUzOVowdzELMAkGA1UEBhMCU0Ux UUwgQUIwHhcNMDkwMTI4MTEwNDM5WhcNMTAwMTI4MTEwNDM5WjBlMQswCQYDVQQG
EDAOBgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15 EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxMTAvBgkq
U1FMIEFCMTEwLwYJKoZIhvcNAQkBFiJhYnN0cmFjdC5teXNxbC5kZXZlbG9wZXJA hkiG9w0BCQEWImFic3RyYWN0Lm15c3FsLmRldmVsb3BlckBteXNxbC5jb20wXDAN
bXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjbaChJhE3WD1y8PZqr BgkqhkiG9w0BAQEFAANLADBIAkEA4VIwLNm+ZCiRXXr92ekUNXrSlE6RRuDbn2t5
cNU+9bUXuu/h+IdUMCIfgQe/+SR/ilQQ6V/mmVAE1DtVqfFSrRIrWtpcvow+W56w 9EysbgdhNIZ0YqeoRK/6h4eofUJh/6tQ1Hu/dfrV1bN0+1YeNwIDAQABo4GjMIGg
WhkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQAHV78HksKOhiRrCr/lMSFEw2ACpqye MAkGA1UdEwQCMAAwHQYDVR0OBBYEFFgwtZssBZQGuj088LLNHWdl43+FMHQGA1Ud
99t6bvxP1HtUGIBH0kpjDuP4r25Y45daK4JddiDRM6D1Q6HRUfTKyLMaZk4OVd/S IwRtMGuAFPLi6lVlpJrirJ2X9UVs9veMEa3foUikRjBEMQswCQYDVQQGEwJTRTEQ
6PqDGEL17GZA8Dno+dfP9t3ke2ndDJLYUpVDbyk98I1M3VLqa6A5D9xZp1w3a4sF MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
RLdp6qNY4E7O1g== UUwgQUKCCQCV6Xj1NFDk1TANBgkqhkiG9w0BAQUFAAOBgQAFGeMTFPzFKL9p+ACz
Jcu9yp8vTLOoBBHwdCe9giy0SZunWfD3h9Hgupmi/ksdEG/korPNf4toMUbuzZ7i
R+FM+nTR4ovMoEuoJNGkw2sqxijNQeAGSObP8jzKN5XXKWRrkZGD56zIC4e82qaq
8URDyHR7FSaRLgPEcVBs+GjcjA==
-----END CERTIFICATE----- -----END CERTIFICATE-----
mysql-test/std_data/client-key.pem
View file @ ba4a5e8c
-----BEGIN RSA PRIVATE KEY----- -----BEGIN RSA PRIVATE KEY-----
MIIBOgIBAAJBANjbaChJhE3WD1y8PZqrcNU+9bUXuu/h+IdUMCIfgQe/+SR/ilQQ MIIBOQIBAAJBAOFSMCzZvmQokV16/dnpFDV60pROkUbg259refRMrG4HYTSGdGKn
6V/mmVAE1DtVqfFSrRIrWtpcvow+W56wWhkCAwEAAQJAK27WT6tZylUjQomZNQ89 qESv+oeHqH1CYf+rUNR7v3X61dWzdPtWHjcCAwEAAQJAXYooM8ZlcuEgj+VKU1ee
TBiOEbUtBbqWklQ0R8FTkH9uKV+8KYQ+k+tMkoAEGFfChB0YfofNQ2KZYWWw4yOB qyEFIMqJJxqcMk+E/nWCM96WxCP3zHNSrqNfSpI3ld7QzMwhdRz+gFLxT2gGNpIw
WQIhAPXXDQt73aou10s+cmKM3C3WzLmIZtrvm9wNBXWDGxgTAiEA4dG4cXrZfa1M MQIhAPxzM/lDihe67X3ADYtDl9ZjA8Pm430x9sXlcxI17tCZAiEA5H1SyFl4mUee
TTbjzNU1/Jf50/M8SvZDWMPQWxJ8oqMCIH6zBpYUkHlVCsBMvsbrsc4uFfTIx7mu 9VnfSC2XGW7lwz72ZygfVX+b7tLWF08CIEh40gzW5MfXM+KLxdea+fXjyursV5ZT
I7WVQGr/1sbhAiBf4uFirjtztgZUMx5/d3k5DH80lG/hlLf8FQl/4lWx6QIhAPHw R6KcMiKiNQLRAiAcmHqlzFzFgisotai2Fc6VRkXHG7gmzOSvBJt1VjmpDQIge6jf
CXfPUbUFl4r/i9Br5+exGol50qX4F3aP5Sh5EnZT 2N7whTdvC4ferB+zUlgWQdyvx1c3T4gnt6PYdaY=
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----
mysql-test/std_data/server-cert-des.pem deleted 100644 → 0
View file @ 23d032c3
-----BEGIN CERTIFICATE-----
MIICljCCAX4CAQEwDQYJKoZIhvcNAQEEBQAwUTELMAkGA1UEBhMCU0UxEDAOBgNV
BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMRAwDgYDVQQLEwdTdXBwb3J0
MQswCQYDVQQDEwJDQTAeFw0wNjA4MjgxMTA4NTlaFw0wOTA1MjQxMTA4NTlaMFUx
CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBB
QjEQMA4GA1UECxMHU3VwcG9ydDEPMA0GA1UEAxMGc2VydmVyMIGfMA0GCSqGSIb3
DQEBAQUAA4GNADCBiQKBgQDEiOVZcWYzZe7I8xhhUwCzvmkZifAXeMTH+8XKGLHX
NWF3FLduAmeAad9oOZgBKb+oWTdRDWXqwu6nYYUBfrUpaY27/wLkgWRgewL3LZnw
W2FjhNsjx3gI2NK+Pix47q9d+a+5T4AW5+lK499l0K0k2cvyFdIerhDW8R0t8Uru
twIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQC2LQcqLg52RbelWrKutlJ5E6rzugnJ
ZAlbN9sM98O2xFiIGDA3tb5j9LAEjE0E+RqdptEYnvy9b3szhLYXtIILZTkClf9r
Uwu1nUYPTyp+9ZYCa4fovOU5h1Ogv+9UZPds/LPDwWEn8K+lvscB4X57wJyuoEck
1Mu41OA6h77181MydSdgZo0oquJDWhdCsYHXVFVs0F6naMm2uPMCTDiQVlhHJuTO
VQMNIwxRFtvsv2tpsXsaP/8sT32d5CFebfxxSVnqQvJ4ZdIrphl6L43XU01rsEcE
K8KYujZQ6SKws+HVcGqsr7TPgJfJE6D+5RazvvIQISPvx4eduebqzqdC
-----END CERTIFICATE-----
mysql-test/std_data/server-cert.pem
View file @ ba4a5e8c
Certificate: Certificate:
Data: Data:
Version: 1 (0x0) Version: 3 (0x2)
Serial Number: 1 (0x1) Serial Number: 1 (0x1)
Signature Algorithm: md5WithRSAEncryption Signature Algorithm: sha1WithRSAEncryption
Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
Validity Validity
Not Before: May 3 08:54:13 2006 GMT Not Before: Jan 28 10:55:13 2009 GMT
Not After : Jan 27 08:54:13 2009 GMT Not After : Jan 28 10:55:13 2010 GMT
Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer@mysql.com Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer@mysql.com
Subject Public Key Info: Subject Public Key Info:
Public Key Algorithm: rsaEncryption Public Key Algorithm: rsaEncryption
RSA Public Key: (512 bit) RSA Public Key: (512 bit)
Modulus (512 bit): Modulus (512 bit):
00:d9:fd:da:b3:fb:7c:e0:b0:03:be:97:c6:a4:36: 00:b6:8f:e5:b7:b4:86:83:13:8a:f9:bf:63:cb:64:
ac:71:af:bb:2d:e5:84:ed:f3:8f:2b:eb:11:e5:aa: 2d:b9:51:d1:de:ab:7b:45:1f:aa:b5:66:73:13:f9:
66:ed:bf:62:6b:e3:ce:fa:80:ed:90:ff:b9:4a:39: a6:07:d5:ba:7c:fa:92:bd:37:e2:ad:87:db:3e:b6:
20:40:b6:f2:99:bf:2f:33:b5:f2:ec:3a:90:60:1d: 6a:12:64:f8:ee:17:e3:15:06:2f:a8:82:68:bf:57:
9e:94:7e:a4:1b 8d:c3:04:98:27
Exponent: 65537 (0x10001) Exponent: 65537 (0x10001)
Signature Algorithm: md5WithRSAEncryption X509v3 extensions:
de:5e:35:cd:7b:11:e6:7c:c5:7c:d6:27:4e:72:12:49:42:eb: X509v3 Basic Constraints:
6f:2c:96:f3:f4:00:78:a7:4f:9f:2d:7b:d7:30:39:af:49:4d: CA:FALSE
df:b1:55:0d:30:be:23:6f:06:67:fd:dd:ba:98:66:36:c6:32: X509v3 Subject Key Identifier:
b7:ed:63:fc:aa:49:cd:4f:72:98:3b:13:0e:f6:28:d7:d4:eb: D9:9A:B8:5F:22:EA:04:10:C8:25:7D:82:57:E6:2E:FD:19:29:E7:DA
04:6b:dc:e8:c7:04:80:92:e4:04:86:0b:ed:32:25:76:1d:a9: X509v3 Authority Key Identifier:
5c:a9:2c:18:2c:bd:bc:15:ed:e1:76:96:4d:bb:0d:41:44:06: keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF
2c:ad:45:bb:db:61:ad:17:11:cb:49:70:67:eb:c6:27:d3:91: DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
c8:f2 serial:95:E9:78:F5:34:50:E4:D5
Signature Algorithm: sha1WithRSAEncryption
54:07:2d:21:0b:a5:af:3b:58:23:32:5e:56:7f:ab:58:63:48:
91:aa:38:90:89:16:f9:cc:bf:a4:0e:78:2b:9f:c5:1b:58:a6:
e6:08:8f:2e:ae:97:03:21:9b:f1:cd:c0:26:8f:1d:d7:28:27:
a0:8e:81:09:1b:1c:0f:c9:a5:41:3a:2d:44:3f:9c:fa:87:ff:
c8:4c:2b:44:f7:1b:c1:3e:4f:01:7f:e9:26:cc:9f:1c:06:b5:
0b:27:d1:10:90:be:93:0c:9c:e7:b0:d1:ea:27:99:4e:06:14:
0c:7a:e9:c1:52:c5:33:68:bc:61:0d:db:81:3b:57:48:57:bf:
42:9a
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIB+zCCAWQCAQEwDQYJKoZIhvcNAQEEBQAwRDELMAkGA1UEBhMCU0UxEDAOBgNV MIICkzCCAfygAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
BAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFC MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
MB4XDTA2MDUwMzA4NTQxM1oXDTA5MDEyNzA4NTQxM1owgYsxCzAJBgNVBAYTAlNF UUwgQUIwHhcNMDkwMTI4MTA1NTEzWhcNMTAwMTI4MTA1NTEzWjB5MQswCQYDVQQG
MRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYDVQQKEwhN EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV
eVNRTCBBQjESMBAGA1UEAxMJbG9jYWxob3N0MTEwLwYJKoZIhvcNAQkBFiJhYnN0 BAMTCWxvY2FsaG9zdDExMC8GCSqGSIb3DQEJARYiYWJzdHJhY3QubXlzcWwuZGV2
cmFjdC5teXNxbC5kZXZlbG9wZXJAbXlzcWwuY29tMFwwDQYJKoZIhvcNAQEBBQAD ZWxvcGVyQG15c3FsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC2j+W3tIaD
SwAwSAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA7ZD/ E4r5v2PLZC25UdHeq3tFH6q1ZnMT+aYH1bp8+pK9N+Kth9s+tmoSZPjuF+MVBi+o
uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAATANBgkqhkiG9w0BAQQFAAOBgQDe gmi/V43DBJgnAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQU2Zq4XyLq
XjXNexHmfMV81idOchJJQutvLJbz9AB4p0+fLXvXMDmvSU3fsVUNML4jbwZn/d26 BBDIJX2CV+Yu/Rkp59owdAYDVR0jBG0wa4AU8uLqVWWkmuKsnZf1RWz294wRrd+h
mGY2xjK37WP8qknNT3KYOxMO9ijX1OsEa9zoxwSAkuQEhgvtMiV2HalcqSwYLL28 SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV
Fe3hdpZNuw1BRAYsrUW722GtFxHLSXBn68Yn05HI8g== cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTVMA0GCSqGSIb3DQEB
BQUAA4GBAFQHLSELpa87WCMyXlZ/q1hjSJGqOJCJFvnMv6QOeCufxRtYpuYIjy6u
lwMhm/HNwCaPHdcoJ6COgQkbHA/JpUE6LUQ/nPqH/8hMK0T3G8E+TwF/6SbMnxwG
tQsn0RCQvpMMnOew0eonmU4GFAx66cFSxTNovGEN24E7V0hXv0Ka
-----END CERTIFICATE----- -----END CERTIFICATE-----
mysql-test/std_data/server-key-des.pem deleted 100644 → 0
View file @ 23d032c3
-----BEGIN RSA PRIVATE KEY-----
Proc-Type: 4,ENCRYPTED
DEK-Info: DES-EDE3-CBC,D2BE7598C7E3BDA5
1W3qPgw5ut80OhaAGVZZe/tfFiBAlwpX1SohdApWj+QYP+dK/mdEBhgI3BXTFNLW
pJqDTzGlKtft7hHN6QDFEdZMKxej5+2iLu14V62o+5yQgUoqswoXcmmqJCJ7AvyJ
yMBmGAzxRFlQsT8lf6o5TS1/efBvjvWhh3NG2Zq2LpyhWRRqA3kNhzktzt2WjDZe
ZkKmZJJnArr/Aw7jEBC4sH+nmgxoR18GzDddRG12hv1AWyHc3+VisTBpyNzeBy17
rxuQtqLzkAJmId723ddw83RVNSvBUUS3G0rx5O3HPobvZK89UqVxcXtIgc11WTVU
N3DbcJq5it43Loo0W3gAngtESDm2E3rTadrmdUSDGv2wQ5dNFl6cQ1f397Sdd/WC
A0grn1tKjJ6COp80Ymdyvn+stjv/+Rl1/KHSeG0lNeZxqjPPOJ7NHaKv7qjYsJ6W
LT35/Xc3oCo5qk9FOlq/0tGjHxf6RcFr5U7k5ILKZs+RmvJ4Sv/VYShLfLTcfGbJ
wBNfRKvcHZBQJQBb1+s/kRrjFFtvhrUwLz4+c9kskp+t4qRVYywUAnGGGsMs/GPm
wYsLQZO6Bs5/taaVUyaJQW015J7FGGv+/7/A1dIhu73S/Xl/YcFbX/CMEVq2Lxxd
hZdFIuaZ7LE+0MDQWsvYMYPDPLDH11diczb/jeKBdLPOzk/FUqVx3Fin1PpcaBxY
b+7oZJhYdg/rAWDeQ/nji9qnEG8waK6x1hdkYPOrqqWQPfgM/LPsSrgWeuTSdx2B
Ixi01UlBb5UP4K7UrjyddPobmcVjXaQLNe7zaq0+OS3UnIG85GtHrQ==
-----END RSA PRIVATE KEY-----
mysql-test/std_data/server-key.pem
View file @ ba4a5e8c
-----BEGIN RSA PRIVATE KEY----- -----BEGIN RSA PRIVATE KEY-----
MIIBOgIBAAJBANn92rP7fOCwA76XxqQ2rHGvuy3lhO3zjyvrEeWqZu2/YmvjzvqA MIIBOQIBAAJBALaP5be0hoMTivm/Y8tkLblR0d6re0UfqrVmcxP5pgfVunz6kr03
7ZD/uUo5IEC28pm/LzO18uw6kGAdnpR+pBsCAwEAAQJBAMieYdpmRoUaODf9wqh6 4q2H2z62ahJk+O4X4xUGL6iCaL9XjcMEmCcCAwEAAQJASA5VwgNb0CKHiPm0ntOk
ULXH/sG8i1vaXRcUHcJ50oRVfVK8/tGGvUuTDu6MeINTdahNDlYfjwOjKWVXys1w hG+54SRX3DmafEy6gRjZIl/bZ/asSLhXUZ+CeohyrQh7BZgYWvykd8pRISL9eKsU
h6ECIQDs6s7DfczK2bKCLt0zqg24mZL3rOpGmDU+TatwN1yVgwIhAOuMzdVTX39p GQIhAOXkUrOtP/EtjyqNluEqZdG+RZi/7p61JS3Ce13Myu+LAiEAy0uMlV34AJpM
328+5WxJvBOFfxmSmqdDhIFpnRMvgguJAiByvKjT/km+970+1OllyvaIL0AA2OpA b40FPKqlHxw8DD/Dt1iKhNVAg8+LDVUCIFjv7fbJDbW2VG63/Cj8CAwOukoP5rbL
tBgdC0p6tyUMdwIgKuHAWzTJbu28UolVxQgLaFZmVCZ/ZzIAfnrWsLZ2a1kCIBq/ iaicVrHBKrllAiB9+MiaXeopZXNrxDS0jQFYr8Q9yt1aJVFgUkxx4Q9HKQIgZPs0
ywJ2cpyFlgazu8AH6KCQa0ok9s70ElaB6FEC85Al KlF3NNNWw78INaAEkyf0IEssnLMsuoCWw0DIOak=
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----
mysql-test/std_data/server8k-cert.pem
View file @ ba4a5e8c
This diff is collapsed.
mysql-test/std_data/server8k-key.pem
View file @ ba4a5e8c
This diff is collapsed.
mysql-test/suite/bugs/r/rpl_bug36391.result 0 → 100644
View file @ ba4a5e8c
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
drop table if exists t1;
Warnings:
Note 1051 Unknown table 't1'
create table t1(id int);
show tables;
Tables_in_test
t1
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 278
flush logs;
mysql-test/suite/bugs/t/rpl_bug36391.test 0 → 100644
View file @ ba4a5e8c
#
# BUG#36391 and BUG#38731
#
# The fix for BUG#20103 "Escaping with backslash does not work as expected"
# was implemented too greedy though in that it not only changes the behavior
# of backslashes within strings but in general, so disabling command shortcuts
# like \G or \C (which in turn leads to BUG#36391: "mysqlbinlog creates invalid charset statements".
#
# The test executes simple commands that are stored in the binary log and
# re-execute them through the mysql client which should have to process
# some command shortcuts. The backslashes within strings is disabled in the file
# rpl_bug36391-master.opt by the option --sql_mode=NO_BACKSLASH_ESCAPES.
#
#
--source include/master-slave.inc
drop table if exists t1;
create table t1(id int);
show tables;
show master status;
flush logs;
--exec $MYSQL_BINLOG $MYSQL_TEST_DIR/var/log/master-bin.000001 | $MYSQL test
mysql-test/suite/rpl/t/rpl_cross_version-master.opt
View file @ ba4a5e8c
--replicate-same-server-id --relay-log=slave-relay-bin --replicate-same-server-id --relay-log=slave-relay-bin --secure-file-priv=$MYSQL_TMP_DIR
mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
View file @ ba4a5e8c
...@@ -28,59 +28,68 @@ ...@@ -28,59 +28,68 @@
--source include/load_sysvars.inc --source include/load_sysvars.inc
######################################################################## let $minimum_range= BETWEEN 8 AND 36;
########################################################################
# START OF key_buffer_size TESTS # # START OF key_buffer_size TESTS #
######################################################################## ########################################################################
--disable_warnings --disable_warnings
######################################################################## ########################################################################
# Saving initial value of key_buffer_size in a temporary variable # # Saving initial value of key_buffer_size in a temporary variable #
######################################################################## ########################################################################
SET @start_value = @@global.key_buffer_size; SET @start_value = @@global.key_buffer_size;
--echo '#--------------------FN_DYNVARS_055_01------------------------#' --echo '#--------------------FN_DYNVARS_055_01------------------------#'
######################################################################## ########################################################################
# Display the DEFAULT value of key_buffer_size # # Display the DEFAULT value of key_buffer_size #
######################################################################## ########################################################################
SET @@global.key_buffer_size = 99; SET @@global.key_buffer_size = 99;
--Error ER_NO_DEFAULT --Error ER_NO_DEFAULT
SET @@global.key_buffer_size = DEFAULT; SET @@global.key_buffer_size = DEFAULT;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
--echo '#---------------------FN_DYNVARS_055_02-------------------------#' --echo '#---------------------FN_DYNVARS_055_02-------------------------#'
############################################### ###############################################
# Verify default value of variable # # Verify default value of variable #
############################################### ###############################################
SET @@global.key_buffer_size = @start_value; SET @@global.key_buffer_size = @start_value;
SELECT @@global.key_buffer_size = @start_value; SELECT @@global.key_buffer_size = @start_value;
--echo '#--------------------FN_DYNVARS_055_03------------------------#' --echo '#--------------------FN_DYNVARS_055_03------------------------#'
######################################################################## ########################################################################
# Change the value of key_buffer_size to a valid value # # Change the value of key_buffer_size to a valid value #
######################################################################## ########################################################################
SET @@global.key_buffer_size = 8 ; SET @@global.key_buffer_size = 8 ;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
--disable_warnings --disable_warnings
#Due to increasing the runtime significantly and allocating the buffer instantly. # The next subtest is set to comment because it will
# be tried to allocate the buffer instantly which
# might lead to a message about missing resources,
# excessive runtime etc. especially if the main memory is less than 4GB.
#SET @@global.key_buffer_size = 4294967295; #SET @@global.key_buffer_size = 4294967295;
--enable_warnings --enable_warnings
#SELECT @@global.key_buffer_size; #SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 1800; SET @@global.key_buffer_size = 1800;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
SET @@global.key_buffer_size = 65535; SET @@global.key_buffer_size = 65535;
SELECT @@global.key_buffer_size; SELECT @@global.key_buffer_size;
--echo '#--------------------FN_DYNVARS_055_04-------------------------#' --echo '#--------------------FN_DYNVARS_055_04-------------------------#'
########################################################################### ###########################################################################
# Change the value of key_buffer_size to invalid value # # Change the value of key_buffer_size to invalid value #
########################################################################### ###########################################################################
# Due to increasing the runtime significantly and allocating the buffer instantly # The next subtests are set to comment because they will
# with a size of 18446744073709551615 bytes with 32bit exec. # be tried to allocate the buffer instantly which
# might lead to a message about missing resources,
# excessive runtime etc. especially if the main memory is less than 4GB.
# The negative values lead to very big numbers, e.g. -1 to
# a size of 18446744073709551615 bytes with a 32bit binary.
# See Bug #42103.
#SET @@global.key_buffer_size = -1; #SET @@global.key_buffer_size = -1;
#SELECT @@global.key_buffer_size; #SELECT @@global.key_buffer_size;
#SET @@global.key_buffer_size = 100000000000; #SET @@global.key_buffer_size = 100000000000;
...@@ -91,46 +100,49 @@ SELECT @@global.key_buffer_size; ...@@ -91,46 +100,49 @@ SELECT @@global.key_buffer_size;
#SET @@global.key_buffer_size = -1024; #SET @@global.key_buffer_size = -1024;
#SELECT @@global.key_buffer_size; #SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 4; SET @@global.key_buffer_size = 4;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
--Error ER_WRONG_TYPE_FOR_VAR --Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_buffer_size = ON; SET @@global.key_buffer_size = ON;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
--Error ER_WRONG_TYPE_FOR_VAR --Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_buffer_size = 'test'; SET @@global.key_buffer_size = 'test';
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
--echo '#-------------------FN_DYNVARS_055_05----------------------------#' --echo '#-------------------FN_DYNVARS_055_05----------------------------#'
########################################################################### ###########################################################################
# Test if accessing session key_buffer_size gives error # # Test if accessing session key_buffer_size gives error #
########################################################################### ###########################################################################
--Error ER_GLOBAL_VARIABLE --Error ER_GLOBAL_VARIABLE
SET @@session.key_buffer_size = 0; SET @@session.key_buffer_size = 0;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
--echo '#----------------------FN_DYNVARS_055_06------------------------#' --echo '#----------------------FN_DYNVARS_055_06------------------------#'
############################################################################## ##############################################################################
# Check if the value in GLOBAL & SESSION Tables matches values in variable # # Check if the value in GLOBAL & SESSION Tables matches values in variable #
############################################################################## ##############################################################################
SELECT @@global.key_buffer_size = VARIABLE_VALUE SELECT @@global.key_buffer_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='key_buffer_size'; WHERE VARIABLE_NAME='key_buffer_size';
SELECT @@key_buffer_size = VARIABLE_VALUE SELECT @@key_buffer_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='key_buffer_size'; WHERE VARIABLE_NAME='key_buffer_size';
--echo '#---------------------FN_DYNVARS_055_07----------------------#' --echo '#---------------------FN_DYNVARS_055_07----------------------#'
################################################################### ###################################################################
# Check if TRUE and FALSE values can be used on variable # # Check if TRUE and FALSE values can be used on variable #
################################################################### ###################################################################
# The following assignment are accepted, but should be rejected
# like the value ON (see above).
# See Bug #42104
SET @@global.key_buffer_size = TRUE; SET @@global.key_buffer_size = TRUE;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
SET @@global.key_buffer_size = FALSE; SET @@global.key_buffer_size = FALSE;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
--echo '#---------------------FN_DYNVARS_055_08----------------------#' --echo '#---------------------FN_DYNVARS_055_08----------------------#'
##################################################################### #####################################################################
...@@ -145,13 +157,13 @@ SELECT @@key_buffer_size = @@global.key_buffer_size; ...@@ -145,13 +157,13 @@ SELECT @@key_buffer_size = @@global.key_buffer_size;
--enable_warnings --enable_warnings
--echo '#---------------------FN_DYNVARS_055_09----------------------#' --echo '#---------------------FN_DYNVARS_055_09----------------------#'
########################################################################## ##########################################################################
# Check if key_buffer_size can be accessed with and without @@ sign # # Check if key_buffer_size can be accessed with and without @@ sign #
########################################################################## ##########################################################################
--Error ER_GLOBAL_VARIABLE --Error ER_GLOBAL_VARIABLE
SET key_buffer_size = 8 ; SET key_buffer_size = 8 ;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; eval SELECT @@global.key_buffer_size $minimum_range;
--Error ER_PARSE_ERROR --Error ER_PARSE_ERROR
SET local.key_buffer_size = 10; SET local.key_buffer_size = 10;
--Error ER_UNKNOWN_TABLE --Error ER_UNKNOWN_TABLE
...@@ -163,8 +175,7 @@ SELECT global.key_buffer_size; ...@@ -163,8 +175,7 @@ SELECT global.key_buffer_size;
--Error ER_BAD_FIELD_ERROR --Error ER_BAD_FIELD_ERROR
SELECT key_buffer_size = @@session.key_buffer_size; SELECT key_buffer_size = @@session.key_buffer_size;
##############################
##############################
# Restore initial value # # Restore initial value #
############################## ##############################
......
mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
View file @ ba4a5e8c
...@@ -3,8 +3,8 @@ SET @start_value = @@global.key_buffer_size; ...@@ -3,8 +3,8 @@ SET @start_value = @@global.key_buffer_size;
SET @@global.key_buffer_size = 99; SET @@global.key_buffer_size = 99;
SET @@global.key_buffer_size = DEFAULT; SET @@global.key_buffer_size = DEFAULT;
ERROR 42000: Variable 'key_buffer_size' doesn't have a default value ERROR 42000: Variable 'key_buffer_size' doesn't have a default value
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
'#---------------------FN_DYNVARS_055_02-------------------------#' '#---------------------FN_DYNVARS_055_02-------------------------#'
SET @@global.key_buffer_size = @start_value; SET @@global.key_buffer_size = @start_value;
...@@ -13,14 +13,14 @@ SELECT @@global.key_buffer_size = @start_value; ...@@ -13,14 +13,14 @@ SELECT @@global.key_buffer_size = @start_value;
1 1
'#--------------------FN_DYNVARS_055_03------------------------#' '#--------------------FN_DYNVARS_055_03------------------------#'
SET @@global.key_buffer_size = 8 ; SET @@global.key_buffer_size = 8 ;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = 1800; SET @@global.key_buffer_size = 1800;
Warnings: Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '1800' Warning 1292 Truncated incorrect key_buffer_size value: '1800'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = 65535; SET @@global.key_buffer_size = 65535;
SELECT @@global.key_buffer_size; SELECT @@global.key_buffer_size;
...@@ -35,24 +35,24 @@ SELECT @@global.key_buffer_size; ...@@ -35,24 +35,24 @@ SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 4; SET @@global.key_buffer_size = 4;
Warnings: Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '4' Warning 1292 Truncated incorrect key_buffer_size value: '4'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = ON; SET @@global.key_buffer_size = ON;
ERROR 42000: Incorrect argument type to variable 'key_buffer_size' ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = 'test'; SET @@global.key_buffer_size = 'test';
ERROR 42000: Incorrect argument type to variable 'key_buffer_size' ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
'#-------------------FN_DYNVARS_055_05----------------------------#' '#-------------------FN_DYNVARS_055_05----------------------------#'
SET @@session.key_buffer_size = 0; SET @@session.key_buffer_size = 0;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
'#----------------------FN_DYNVARS_055_06------------------------#' '#----------------------FN_DYNVARS_055_06------------------------#'
SELECT @@global.key_buffer_size = VARIABLE_VALUE SELECT @@global.key_buffer_size = VARIABLE_VALUE
...@@ -69,14 +69,14 @@ WHERE VARIABLE_NAME='key_buffer_size'; ...@@ -69,14 +69,14 @@ WHERE VARIABLE_NAME='key_buffer_size';
SET @@global.key_buffer_size = TRUE; SET @@global.key_buffer_size = TRUE;
Warnings: Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '1' Warning 1292 Truncated incorrect key_buffer_size value: '1'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = FALSE; SET @@global.key_buffer_size = FALSE;
Warnings: Warnings:
Warning 1438 Cannot drop default keycache Warning 1438 Cannot drop default keycache
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
'#---------------------FN_DYNVARS_055_08----------------------#' '#---------------------FN_DYNVARS_055_08----------------------#'
SET @@global.key_buffer_size = 8 ; SET @@global.key_buffer_size = 8 ;
...@@ -86,8 +86,8 @@ SELECT @@key_buffer_size = @@global.key_buffer_size; ...@@ -86,8 +86,8 @@ SELECT @@key_buffer_size = @@global.key_buffer_size;
'#---------------------FN_DYNVARS_055_09----------------------#' '#---------------------FN_DYNVARS_055_09----------------------#'
SET key_buffer_size = 8 ; SET key_buffer_size = 8 ;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET local.key_buffer_size = 10; SET local.key_buffer_size = 10;
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 'key_buffer_size = 10' at line 1 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 'key_buffer_size = 10' at line 1
......
mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
View file @ ba4a5e8c
...@@ -3,8 +3,8 @@ SET @start_value = @@global.key_buffer_size; ...@@ -3,8 +3,8 @@ SET @start_value = @@global.key_buffer_size;
SET @@global.key_buffer_size = 99; SET @@global.key_buffer_size = 99;
SET @@global.key_buffer_size = DEFAULT; SET @@global.key_buffer_size = DEFAULT;
ERROR 42000: Variable 'key_buffer_size' doesn't have a default value ERROR 42000: Variable 'key_buffer_size' doesn't have a default value
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
'#---------------------FN_DYNVARS_055_02-------------------------#' '#---------------------FN_DYNVARS_055_02-------------------------#'
SET @@global.key_buffer_size = @start_value; SET @@global.key_buffer_size = @start_value;
...@@ -13,14 +13,14 @@ SELECT @@global.key_buffer_size = @start_value; ...@@ -13,14 +13,14 @@ SELECT @@global.key_buffer_size = @start_value;
1 1
'#--------------------FN_DYNVARS_055_03------------------------#' '#--------------------FN_DYNVARS_055_03------------------------#'
SET @@global.key_buffer_size = 8 ; SET @@global.key_buffer_size = 8 ;
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = 1800; SET @@global.key_buffer_size = 1800;
Warnings: Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '1800' Warning 1292 Truncated incorrect key_buffer_size value: '1800'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = 65535; SET @@global.key_buffer_size = 65535;
SELECT @@global.key_buffer_size; SELECT @@global.key_buffer_size;
...@@ -35,33 +35,33 @@ SELECT @@global.key_buffer_size; ...@@ -35,33 +35,33 @@ SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 4; SET @@global.key_buffer_size = 4;
Warnings: Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '4' Warning 1292 Truncated incorrect key_buffer_size value: '4'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = ON; SET @@global.key_buffer_size = ON;
ERROR 42000: Incorrect argument type to variable 'key_buffer_size' ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = 'test'; SET @@global.key_buffer_size = 'test';
ERROR 42000: Incorrect argument type to variable 'key_buffer_size' ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
'#-------------------FN_DYNVARS_055_05----------------------------#' '#-------------------FN_DYNVARS_055_05----------------------------#'
SET @@session.key_buffer_size = 0; SET @@session.key_buffer_size = 0;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
'#----------------------FN_DYNVARS_055_06------------------------#' '#----------------------FN_DYNVARS_055_06------------------------#'
SELECT @@global.key_buffer_size = VARIABLE_VALUE SELECT @@global.key_buffer_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='key_buffer_size'; WHERE VARIABLE_NAME='key_buffer_size';
@@global.key_buffer_size = VARIABLE_VALUE @@global.key_buffer_size = VARIABLE_VALUE
1 1
SELECT @@key_buffer_size = VARIABLE_VALUE SELECT @@key_buffer_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='key_buffer_size'; WHERE VARIABLE_NAME='key_buffer_size';
@@key_buffer_size = VARIABLE_VALUE @@key_buffer_size = VARIABLE_VALUE
1 1
...@@ -69,14 +69,14 @@ WHERE VARIABLE_NAME='key_buffer_size'; ...@@ -69,14 +69,14 @@ WHERE VARIABLE_NAME='key_buffer_size';
SET @@global.key_buffer_size = TRUE; SET @@global.key_buffer_size = TRUE;
Warnings: Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '1' Warning 1292 Truncated incorrect key_buffer_size value: '1'
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET @@global.key_buffer_size = FALSE; SET @@global.key_buffer_size = FALSE;
Warnings: Warnings:
Warning 1438 Cannot drop default keycache Warning 1438 Cannot drop default keycache
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
'#---------------------FN_DYNVARS_055_08----------------------#' '#---------------------FN_DYNVARS_055_08----------------------#'
SET @@global.key_buffer_size = 8 ; SET @@global.key_buffer_size = 8 ;
...@@ -86,8 +86,8 @@ SELECT @@key_buffer_size = @@global.key_buffer_size; ...@@ -86,8 +86,8 @@ SELECT @@key_buffer_size = @@global.key_buffer_size;
'#---------------------FN_DYNVARS_055_09----------------------#' '#---------------------FN_DYNVARS_055_09----------------------#'
SET key_buffer_size = 8 ; SET key_buffer_size = 8 ;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36; SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size >= 8 AND @@global.key_buffer_size <= 36 @@global.key_buffer_size BETWEEN 8 AND 36
1 1
SET local.key_buffer_size = 10; SET local.key_buffer_size = 10;
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 'key_buffer_size = 10' at line 1 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 'key_buffer_size = 10' at line 1
......
mysql-test/t/openssl_1.test
View file @ ba4a5e8c
...@@ -11,8 +11,8 @@ insert into t1 values (5); ...@@ -11,8 +11,8 @@ insert into t1 values (5);
grant select on test.* to ssl_user1@localhost require SSL; grant select on test.* to ssl_user1@localhost require SSL;
grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA"; grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com"; grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com";
grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx"; grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
flush privileges; flush privileges;
......
mysql-test/t/query_cache_notembedded.test
View file @ ba4a5e8c
...@@ -225,35 +225,6 @@ connection default; ...@@ -225,35 +225,6 @@ connection default;
set GLOBAL query_cache_size=0; set GLOBAL query_cache_size=0;
#
# Bug#40264: Aborted cached query causes query to hang indefinitely on next cache hit
#
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
FLUSH STATUS;
SET GLOBAL query_cache_size=1048576;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
SHOW STATUS LIKE 'Qcache_queries_in_cache';
LOCK TABLES t1 WRITE;
connect(con1,localhost,root,,);
--send SELECT * FROM t1
connection default;
let $show_type= open tables where `table`='t1' and in_use=2;
let $show_pattern= '%t1%2%';
--source include/wait_show_pattern.inc
dirty_close con1;
UNLOCK TABLES;
let $show_type= open tables where `table`='t1' and in_use=0;
let $show_pattern= '%t1%0%';
--source include/wait_show_pattern.inc
SHOW STATUS LIKE 'Qcache_queries_in_cache';
DROP TABLE t1;
SET GLOBAL query_cache_size= default;
# End of 5.0 tests # End of 5.0 tests
SET GLOBAL log_bin_trust_function_creators = 0; SET GLOBAL log_bin_trust_function_creators = 0;
......
mysql-test/t/subselect.test
View file @ ba4a5e8c
...@@ -3391,4 +3391,39 @@ DELETE FROM v3; ...@@ -3391,4 +3391,39 @@ DELETE FROM v3;
DROP VIEW v1,v2,v3; DROP VIEW v1,v2,v3;
DROP TABLE t1,t2; DROP TABLE t1,t2;
--echo #
--echo # BUG#37822: Correlated subquery with IN and IS UNKNOWN provides wrong result
--echo #
create table t1(id integer primary key, g integer, v integer, s char(1));
create table t2(id integer primary key, g integer, v integer, s char(1));
insert into t1 values
(10, 10, 10, 'l'),
(20, 20, 20, 'l'),
(40, 40, 40, 'l'),
(41, 40, null, 'l'),
(50, 50, 50, 'l'),
(51, 50, null, 'l'),
(60, 60, 60, 'l'),
(61, 60, null, 'l'),
(70, 70, 70, 'l'),
(90, 90, null, 'l');
insert into t2 values
(10, 10, 10, 'r'),
(30, 30, 30, 'r'),
(50, 50, 50, 'r'),
(60, 60, 60, 'r'),
(61, 60, null, 'r'),
(70, 70, 70, 'r'),
(71, 70, null, 'r'),
(80, 80, 80, 'r'),
(81, 80, null, 'r'),
(100,100,null, 'r');
select *
from t1
where v in(select v
from t2
where t1.g=t2.g) is unknown;
drop table t1, t2;
--echo End of 5.1 tests. --echo End of 5.1 tests.
mysql-test/t/subselect3.test
View file @ ba4a5e8c
...@@ -640,6 +640,35 @@ WHERE NULL NOT IN ( ...@@ -640,6 +640,35 @@ WHERE NULL NOT IN (
DROP TABLE t1; DROP TABLE t1;
#
# Bug #39069: <row constructor> IN <table-subquery> seriously messed up
#
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1), (2), (11);
--echo # 2nd and 3rd columns should be same
SELECT a, ROW(11, 12) = (SELECT a, 22), ROW(11, 12) IN (SELECT a, 22) FROM t1 GROUP BY t1.a;
SELECT a, ROW(11, 12) = (SELECT a, 12), ROW(11, 12) IN (SELECT a, 12) FROM t1 GROUP BY t1.a;
SELECT a, ROW(11, 12) = (SELECT a, 22), ROW(11, 12) IN (SELECT a, 22) FROM t1;
SELECT a, ROW(11, 12) = (SELECT a, 12), ROW(11, 12) IN (SELECT a, 12) FROM t1;
# The x alias is used below to workaround bug #40674.
# Regression tests for sum function on outer column in subselect from dual:
SELECT a AS x, ROW(11, 12) = (SELECT MAX(x), 22), ROW(11, 12) IN (SELECT MAX(x), 22) FROM t1;
--echo # 2nd and 3rd columns should be same for x == 11 only
SELECT a AS x, ROW(11, 12) = (SELECT MAX(x), 12), ROW(11, 12) IN (SELECT MAX(x), 12) FROM t1;
DROP TABLE t1;
--echo # both columns should be same
SELECT ROW(1,2) = (SELECT NULL, NULL), ROW(1,2) IN (SELECT NULL, NULL);
SELECT ROW(1,2) = (SELECT 1, NULL), ROW(1,2) IN (SELECT 1, NULL);
SELECT ROW(1,2) = (SELECT NULL, 2), ROW(1,2) IN (SELECT NULL, 2);
SELECT ROW(1,2) = (SELECT NULL, 1), ROW(1,2) IN (SELECT NULL, 1);
SELECT ROW(1,2) = (SELECT 1, 1), ROW(1,2) IN (SELECT 1, 1);
SELECT ROW(1,2) = (SELECT 1, 2), ROW(1,2) IN (SELECT 1, 2);
--echo End of 5.0 tests --echo End of 5.0 tests
# #
......
sql/handler.cc
View file @ ba4a5e8c
...@@ -2655,8 +2655,12 @@ void handler::print_error(int error, myf errflag) ...@@ -2655,8 +2655,12 @@ void handler::print_error(int error, myf errflag)
break; break;
case HA_ERR_RECORD_FILE_FULL: case HA_ERR_RECORD_FILE_FULL:
case HA_ERR_INDEX_FILE_FULL: case HA_ERR_INDEX_FILE_FULL:
{
textno=ER_RECORD_FILE_FULL; textno=ER_RECORD_FILE_FULL;
/* Write the error message to error log */
errflag|= ME_NOREFRESH;
break; break;
}
case HA_ERR_LOCK_WAIT_TIMEOUT: case HA_ERR_LOCK_WAIT_TIMEOUT:
textno=ER_LOCK_WAIT_TIMEOUT; textno=ER_LOCK_WAIT_TIMEOUT;
break; break;
......
sql/item_cmpfunc.cc
View file @ ba4a5e8c
...@@ -1623,8 +1623,8 @@ void Item_in_optimizer::cleanup() ...@@ -1623,8 +1623,8 @@ void Item_in_optimizer::cleanup()
bool Item_in_optimizer::is_null() bool Item_in_optimizer::is_null()
{ {
cache->store(args[0]); val_int();
return (null_value= (cache->null_value || args[1]->is_null())); return null_value;
} }
......
sql/sql_select.cc
View file @ ba4a5e8c
...@@ -1676,8 +1676,13 @@ JOIN::exec() ...@@ -1676,8 +1676,13 @@ JOIN::exec()
We have to test for 'conds' here as the WHERE may not be constant We have to test for 'conds' here as the WHERE may not be constant
even if we don't have any tables for prepared statements or if even if we don't have any tables for prepared statements or if
conds uses something like 'rand()'. conds uses something like 'rand()'.
If the HAVING clause is either impossible or always true, then
JOIN::having is set to NULL by optimize_cond.
In this case JOIN::exec must check for JOIN::having_value, in the
same way it checks for JOIN::cond_value.
*/ */
if (cond_value != Item::COND_FALSE && if (cond_value != Item::COND_FALSE &&
having_value != Item::COND_FALSE &&
(!conds || conds->val_int()) && (!conds || conds->val_int()) &&
(!having || having->val_int())) (!having || having->val_int()))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7