List:Commits« Previous MessageNext Message »
From:Bernt M. Johnsen Date:October 18 2012 11:39am
Subject:bzr push into mysql-5.6 branch (bernt.johnsen:4502 to 4503) Bug#14771998
View as plain text  
 4503 Bernt M. Johnsen	2012-10-18
      Bug#14771998 Fix SHA256/RSA tests to be skipped with yassl and move them to main

    removed:
      mysql-test/suite/sha256_auth/
      mysql-test/suite/sha256_auth/inc/
      mysql-test/suite/sha256_auth/r/
      mysql-test/suite/sha256_auth/r/plugin_auth_sha256_tls.result
      mysql-test/suite/sha256_auth/t/
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_tls.test
    added:
      mysql-test/include/have_sha256_rsa_auth.inc
    renamed:
      mysql-test/suite/sha256_auth/r/plugin_auth_sha256.result => mysql-test/r/plugin_auth_sha256.result
      mysql-test/suite/sha256_auth/r/plugin_auth_sha256_2.result => mysql-test/r/plugin_auth_sha256_2.result
      mysql-test/suite/sha256_auth/r/plugin_auth_sha256_server_default.result => mysql-test/r/plugin_auth_sha256_server_default.result
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256-master.opt => mysql-test/t/plugin_auth_sha256-master.opt
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256.test => mysql-test/t/plugin_auth_sha256.test
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_2-master.opt => mysql-test/t/plugin_auth_sha256_2-master.opt
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_2.test => mysql-test/t/plugin_auth_sha256_2.test
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_server_default-master.opt => mysql-test/t/plugin_auth_sha256_server_default-master.opt
      mysql-test/suite/sha256_auth/t/plugin_auth_sha256_server_default.test => mysql-test/t/plugin_auth_sha256_server_default.test
    modified:
      mysql-test/t/plugin_auth_sha256.test
      mysql-test/t/plugin_auth_sha256_2-master.opt
      mysql-test/t/plugin_auth_sha256_2.test
      mysql-test/t/plugin_auth_sha256_server_default-master.opt
      mysql-test/t/plugin_auth_sha256_server_default.test
 4502 Jimmy Yang	2012-10-18
      Fix Bug #14759163 - FTS: LEAKS KERNEL THREAD HANDLES ON WINDOWS. FORGETS
      CLOSEHANDLE() CALL
      
      rb://1401 approved by Kevin Lewis and Sunny Bains

    modified:
      storage/innobase/include/row0ftsort.h
      storage/innobase/row/row0ftsort.cc
=== added file 'mysql-test/include/have_sha256_rsa_auth.inc'
--- a/mysql-test/include/have_sha256_rsa_auth.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/have_sha256_rsa_auth.inc	2012-10-18 11:27:15 +0000
@@ -0,0 +1,5 @@
+# Only run this test if SHA256/RSA authentication are supported
+let $shavars= query_get_value("SELECT COUNT(*) as shavars FROM information_schema.session_variables WHERE variable_name = 'sha256_password_private_key_path'", shavars, 1);
+if ($shavars == 0){
+  skip Need SHA256/RSA authentication support;
+}

=== renamed file 'mysql-test/suite/sha256_auth/r/plugin_auth_sha256.result' => 'mysql-test/r/plugin_auth_sha256.result'
=== renamed file 'mysql-test/suite/sha256_auth/r/plugin_auth_sha256_2.result' => 'mysql-test/r/plugin_auth_sha256_2.result'
=== renamed file 'mysql-test/suite/sha256_auth/r/plugin_auth_sha256_server_default.result' => 'mysql-test/r/plugin_auth_sha256_server_default.result'
=== removed directory 'mysql-test/suite/sha256_auth'
=== removed directory 'mysql-test/suite/sha256_auth/inc'
=== removed directory 'mysql-test/suite/sha256_auth/r'
=== removed file 'mysql-test/suite/sha256_auth/r/plugin_auth_sha256_tls.result'
--- a/mysql-test/suite/sha256_auth/r/plugin_auth_sha256_tls.result	2012-03-23 15:03:42 +0000
+++ b/mysql-test/suite/sha256_auth/r/plugin_auth_sha256_tls.result	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-SHOW STATUS LIKE 'Ssl_cipher';
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
-CREATE USER 'kristofer' IDENTIFIED WITH 'sha256_password';
-SET GLOBAL old_passwords= 2;
-SET SESSION old_passwords= 2;
-SET PASSWORD FOR 'kristofer'=PASSWORD('secret');
-DROP USER 'kristofer';
-GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password';
-SET PASSWORD FOR 'kristofer'@'localhost'=PASSWORD('secret2');
-SELECT USER(),CURRENT_USER();
-USER()	CURRENT_USER()
-kristofer@localhost	kristofer@localhost
-SHOW GRANTS FOR 'kristofer'@'localhost';
-Grants for kristofer@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
-DROP USER 'kristofer'@'localhost';
-GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password';
-SET PASSWORD FOR 'kristofer'@'localhost'=PASSWORD('');
-SELECT USER(),CURRENT_USER();
-USER()	CURRENT_USER()
-kristofer@localhost	kristofer@localhost
-SHOW GRANTS FOR 'kristofer'@'localhost';
-Grants for kristofer@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'kristofer'@'localhost' IDENTIFIED BY PASSWORD '<non-deterministic-password-hash>'
-DROP USER 'kristofer'@'localhost';
-GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33' IDENTIFIED WITH 'sha256_password';
-SET PASSWORD FOR 'kristofer'@'33.33.33.33'=PASSWORD('');
-Connection should fail for localhost
-ERROR 28000: Access denied for user 'kristofer'@'localhost' (using password: NO)
-DROP USER 'kristofer'@'33.33.33.33';
-SET GLOBAL old_passwords= default;

=== removed directory 'mysql-test/suite/sha256_auth/t'
=== removed file 'mysql-test/suite/sha256_auth/t/plugin_auth_sha256_tls.test'
--- a/mysql-test/suite/sha256_auth/t/plugin_auth_sha256_tls.test	2012-03-23 15:03:42 +0000
+++ b/mysql-test/suite/sha256_auth/t/plugin_auth_sha256_tls.test	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
---source include/not_embedded.inc
---source include/mysql_upgrade_preparation.inc
---source include/have_ssl_communication.inc
-
-
-connect (ssl_con,localhost,root,,,,,SSL);
-SHOW STATUS LIKE 'Ssl_cipher';
-
-CREATE USER 'kristofer' IDENTIFIED WITH 'sha256_password';
-SET GLOBAL old_passwords= 2;
-SET SESSION old_passwords= 2;
-SET PASSWORD FOR 'kristofer'=PASSWORD('secret');
-connect(con1,localhost,kristofer,secret,,,,SSL);
-connection con1;
-connection ssl_con;
-disconnect con1;
-DROP USER 'kristofer';
-GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password';
-SET PASSWORD FOR 'kristofer'@'localhost'=PASSWORD('secret2');
-connect(con2,localhost,kristofer,secret2,,,,SSL);
-connection con2;
-SELECT USER(),CURRENT_USER();
---replace_regex /PASSWORD .*$/PASSWORD '<non-deterministic-password-hash>'/
-SHOW GRANTS FOR 'kristofer'@'localhost';
-connection ssl_con;
-disconnect con2;
-DROP USER 'kristofer'@'localhost';
-GRANT ALL ON *.* TO 'kristofer'@'localhost' IDENTIFIED WITH 'sha256_password';
-SET PASSWORD FOR 'kristofer'@'localhost'=PASSWORD('');
-connect(con3,localhost,kristofer,,,,,SSL);
-connection con3;
-SELECT USER(),CURRENT_USER();
---replace_regex /PASSWORD .*$/PASSWORD '<non-deterministic-password-hash>'/
-SHOW GRANTS FOR 'kristofer'@'localhost';
-connection ssl_con;
-disconnect con3;
-DROP USER 'kristofer'@'localhost';
-
-GRANT ALL ON *.* TO 'kristofer'@'33.33.33.33' IDENTIFIED WITH 'sha256_password';
-SET PASSWORD FOR 'kristofer'@'33.33.33.33'=PASSWORD('');
---echo Connection should fail for localhost
---replace_result $MASTER_MYSOCK MASTER_MYSOCK
---disable_query_log
---error ER_ACCESS_DENIED_ERROR
-connect(con4,127.0.0.1,kristofer,,,,,SSL);
---enable_query_log
-DROP USER 'kristofer'@'33.33.33.33';
-# Restore default value to old_passwords
-SET GLOBAL old_passwords= default;
-connection default;
-disconnect ssl_con;
-
-

=== renamed file 'mysql-test/suite/sha256_auth/t/plugin_auth_sha256-master.opt' => 'mysql-test/t/plugin_auth_sha256-master.opt'
=== renamed file 'mysql-test/suite/sha256_auth/t/plugin_auth_sha256.test' => 'mysql-test/t/plugin_auth_sha256.test'
--- a/mysql-test/suite/sha256_auth/t/plugin_auth_sha256.test	2012-08-06 09:45:33 +0000
+++ b/mysql-test/t/plugin_auth_sha256.test	2012-10-18 11:27:15 +0000
@@ -1,4 +1,6 @@
 --source include/not_embedded.inc
+--source include/have_ssl.inc
+--source include/have_sha256_rsa_auth.inc
 --source include/mysql_upgrade_preparation.inc
 
 # This test will intentionally generate errors in the server error log

=== renamed file 'mysql-test/suite/sha256_auth/t/plugin_auth_sha256_2-master.opt' => 'mysql-test/t/plugin_auth_sha256_2-master.opt'
--- a/mysql-test/suite/sha256_auth/t/plugin_auth_sha256_2-master.opt	2012-03-23 15:03:42 +0000
+++ b/mysql-test/t/plugin_auth_sha256_2-master.opt	2012-10-18 11:27:15 +0000
@@ -1,3 +1,3 @@
 --loose-sha256_password_private_key_path=$MYSQL_TEST_DIR/std_data/rsa_private_key.pem
 --loose-sha256_password_public_key_path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem
---default_authentication=sha256_password
+--loose-default_authentication=sha256_password

=== renamed file 'mysql-test/suite/sha256_auth/t/plugin_auth_sha256_2.test' => 'mysql-test/t/plugin_auth_sha256_2.test'
--- a/mysql-test/suite/sha256_auth/t/plugin_auth_sha256_2.test	2012-08-06 09:45:33 +0000
+++ b/mysql-test/t/plugin_auth_sha256_2.test	2012-10-18 11:27:15 +0000
@@ -1,4 +1,6 @@
 --source include/not_embedded.inc
+--source include/have_ssl.inc
+--source include/have_sha256_rsa_auth.inc
 --source include/mysql_upgrade_preparation.inc
 
 CREATE USER 'kristofer' IDENTIFIED BY 'secret';

=== renamed file 'mysql-test/suite/sha256_auth/t/plugin_auth_sha256_server_default-master.opt' => 'mysql-test/t/plugin_auth_sha256_server_default-master.opt'
--- a/mysql-test/suite/sha256_auth/t/plugin_auth_sha256_server_default-master.opt	2012-03-23 15:03:42 +0000
+++ b/mysql-test/t/plugin_auth_sha256_server_default-master.opt	2012-10-18 11:27:15 +0000
@@ -1,3 +1,3 @@
---sha256_password_private_key_path=$MYSQL_TEST_DIR/std_data/rsa_private_key.pem
---sha256_password_public_key_path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem
---default_authentication_plugin=sha256_password
+--loose-sha256_password_private_key_path=$MYSQL_TEST_DIR/std_data/rsa_private_key.pem
+--loose-sha256_password_public_key_path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem
+--loose-default_authentication_plugin=sha256_password

=== renamed file 'mysql-test/suite/sha256_auth/t/plugin_auth_sha256_server_default.test' => 'mysql-test/t/plugin_auth_sha256_server_default.test'
--- a/mysql-test/suite/sha256_auth/t/plugin_auth_sha256_server_default.test	2012-08-06 09:45:33 +0000
+++ b/mysql-test/t/plugin_auth_sha256_server_default.test	2012-10-18 11:27:15 +0000
@@ -1,4 +1,6 @@
 --source include/not_embedded.inc
+--source include/have_ssl.inc
+--source include/have_sha256_rsa_auth.inc
 --source include/mysql_upgrade_preparation.inc
 
 CREATE USER 'kristofer';

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6 branch (bernt.johnsen:4502 to 4503) Bug#14771998Bernt M. Johnsen22 Oct