Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-03-05 10:03:42+01:00, msvensson@stripped +13 -0
Add "have_ssl" as synonym for "have_openssl"
mysql-test/include/have_ssl.inc@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +2 -2
Add "have_ssl" as synonym for "have_openssl"
mysql-test/include/have_ssl.inc@stripped, 2007-03-02 16:51:17+01:00, msvensson@stripped +0 -0
Rename: mysql-test/include/have_openssl.inc -> mysql-test/include/have_ssl.inc
mysql-test/r/have_ssl.require@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +1 -1
Add "have_ssl" as synonym for "have_openssl"
mysql-test/r/have_ssl.require@stripped, 2007-03-02 16:51:58+01:00, msvensson@stripped +0 -0
Rename: mysql-test/r/have_openssl.require -> mysql-test/r/have_ssl.require
mysql-test/t/func_des_encrypt.test@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +1 -1
Add "have_ssl" as synonym for "have_openssl"
mysql-test/t/func_encrypt.test@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +1 -1
Add "have_ssl" as synonym for "have_openssl"
mysql-test/t/openssl_1.test@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +4 -3
Add "have_ssl" as synonym for "have_openssl"
Correct comment
mysql-test/t/rpl_openssl.test@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +1 -1
Add "have_ssl" as synonym for "have_openssl"
mysql-test/t/ssl.test@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +1 -1
Add "have_ssl" as synonym for "have_openssl"
mysql-test/t/ssl_compress.test@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +1 -1
Add "have_ssl" as synonym for "have_openssl"
mysql-test/t/ssl_connect.test@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +1 -1
Add "have_ssl" as synonym for "have_openssl"
mysql-test/t/ssl_des.test@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +1 -1
Add "have_ssl" as synonym for "have_openssl"
sql/mysql_priv.h@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +1 -1
Add "have_ssl" as synonym for "have_openssl"
sql/mysqld.cc@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +5 -5
Add "have_ssl" as synonym for "have_openssl"
sql/set_var.cc@stripped, 2007-03-05 10:03:40+01:00, msvensson@stripped +3 -1
Add "have_ssl" as synonym for "have_openssl"
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: msvensson
# Host: pilot.blaudden
# Root: /home/msvensson/mysql/bug21781/my50-bug21781
--- 1.437/sql/mysql_priv.h 2007-02-15 15:56:36 +01:00
+++ 1.438/sql/mysql_priv.h 2007-03-05 10:03:40 +01:00
@@ -1383,7 +1383,7 @@ extern handlerton myisammrg_hton;
#define have_merge_db myisammrg_hton.state
extern SHOW_COMP_OPTION have_isam;
-extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_dlopen;
+extern SHOW_COMP_OPTION have_raid, have_ssl, have_symlink, have_dlopen;
extern SHOW_COMP_OPTION have_query_cache;
extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
extern SHOW_COMP_OPTION have_crypt;
--- 1.601/sql/mysqld.cc 2007-02-28 16:40:01 +01:00
+++ 1.602/sql/mysqld.cc 2007-03-05 10:03:40 +01:00
@@ -489,7 +489,7 @@ CHARSET_INFO *national_charset_info, *ta
CHARSET_INFO *character_set_filesystem;
SHOW_COMP_OPTION have_isam;
-SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_query_cache;
+SHOW_COMP_OPTION have_raid, have_ssl, have_symlink, have_query_cache;
SHOW_COMP_OPTION have_geometry, have_rtree_keys, have_dlopen;
SHOW_COMP_OPTION have_crypt, have_compress;
@@ -3017,12 +3017,12 @@ static void init_ssl()
if (!ssl_acceptor_fd)
{
opt_use_ssl = 0;
- have_openssl= SHOW_OPTION_DISABLED;
+ have_ssl= SHOW_OPTION_DISABLED;
}
}
else
{
- have_openssl= SHOW_OPTION_DISABLED;
+ have_ssl= SHOW_OPTION_DISABLED;
}
if (des_key_file)
load_des_key_file(des_key_file);
@@ -6591,9 +6591,9 @@ static void mysql_init_variables(void)
have_raid=SHOW_OPTION_NO;
#endif
#ifdef HAVE_OPENSSL
- have_openssl=SHOW_OPTION_YES;
+ have_ssl=SHOW_OPTION_YES;
#else
- have_openssl=SHOW_OPTION_NO;
+ have_ssl=SHOW_OPTION_NO;
#endif
#ifdef HAVE_BROKEN_REALPATH
have_symlink=SHOW_OPTION_NO;
--- 1.20/mysql-test/t/rpl_openssl.test 2007-01-26 11:34:54 +01:00
+++ 1.21/mysql-test/t/rpl_openssl.test 2007-03-05 10:03:40 +01:00
@@ -1,4 +1,4 @@
-source include/have_openssl.inc;
+source include/have_ssl.inc;
source include/master-slave.inc;
# We don't test all types of ssl auth params here since it's a bit hard
--- 1.2/mysql-test/t/func_des_encrypt.test 2005-07-28 02:21:41 +02:00
+++ 1.3/mysql-test/t/func_des_encrypt.test 2007-03-05 10:03:40 +01:00
@@ -1,4 +1,4 @@
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
# This test can't be in func_encrypt.test, because it requires
# --des-key-file to not be set.
--- 1.180/sql/set_var.cc 2007-02-20 16:24:37 +01:00
+++ 1.181/sql/set_var.cc 2007-03-05 10:03:40 +01:00
@@ -874,7 +874,9 @@ struct show_var_st init_vars[]= {
{"have_isam", (char*) &have_isam, SHOW_HAVE},
{"have_merge_engine", (char*) &have_merge_db, SHOW_HAVE},
{"have_ndbcluster", (char*) &have_ndbcluster, SHOW_HAVE},
- {"have_openssl", (char*) &have_openssl, SHOW_HAVE},
+ /* have_openssl is just and alias for have_ssl */
+ {"have_openssl", (char*) &have_ssl, SHOW_HAVE},
+ {"have_ssl", (char*) &have_ssl, SHOW_HAVE},
{"have_query_cache", (char*) &have_query_cache, SHOW_HAVE},
{"have_raid", (char*) &have_raid, SHOW_HAVE},
{"have_rtree_keys", (char*) &have_rtree_keys, SHOW_HAVE},
--- 1.3/mysql-test/t/ssl.test 2005-10-13 11:27:56 +02:00
+++ 1.4/mysql-test/t/ssl.test 2007-03-05 10:03:40 +01:00
@@ -1,7 +1,7 @@
# Turn on ssl between the client and server
# and run a number of tests
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
connect (ssl_con,localhost,root,,,,,SSL);
--- 1.3/mysql-test/t/ssl_compress.test 2005-10-13 11:27:56 +02:00
+++ 1.4/mysql-test/t/ssl_compress.test 2007-03-05 10:03:40 +01:00
@@ -1,7 +1,7 @@
# Turn on compression between the client and server
# and run a number of tests
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
-- source include/have_compress.inc
connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);
--- 1.1/mysql-test/t/ssl_connect.test 2007-01-29 18:32:43 +01:00
+++ 1.2/mysql-test/t/ssl_connect.test 2007-03-05 10:03:40 +01:00
@@ -1,5 +1,5 @@
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
# Repeat connect/disconnect
--- 1.1/mysql-test/t/ssl_des.test 2006-09-25 16:44:13 +02:00
+++ 1.2/mysql-test/t/ssl_des.test 2007-03-05 10:03:40 +01:00
@@ -2,7 +2,7 @@
# then turn on ssl between the client and server
# and run a number of standard tests
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
# Connect by ip to avoid turning on "ssl-verify-server-cert"
connect (ssl_con,127.0.0.1,root,,,,$MASTER_MYPORT,SSL);
--- 1.7/mysql-test/t/func_encrypt.test 2005-07-28 02:21:41 +02:00
+++ 1.8/mysql-test/t/func_encrypt.test 2007-03-05 10:03:40 +01:00
@@ -1,4 +1,4 @@
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
--disable_warnings
drop table if exists t1;
--- 1.4/mysql-test/include/have_openssl.inc 2001-10-04 23:42:16 +02:00
+++ 1.6/mysql-test/include/have_ssl.inc 2007-03-05 10:03:40 +01:00
@@ -1,4 +1,4 @@
--- require r/have_openssl.require
+-- require r/have_ssl.require
disable_query_log;
-show variables like "have_openssl";
+show variables like "have_ssl";
enable_query_log;
--- 1.3/mysql-test/r/have_openssl.require 2001-10-11 02:59:44 +02:00
+++ 1.5/mysql-test/r/have_ssl.require 2007-03-05 10:03:40 +01:00
@@ -1,2 +1,2 @@
Variable_name Value
-have_openssl YES
+have_ssl YES
--- 1.17/mysql-test/t/openssl_1.test 2007-02-06 16:28:33 +01:00
+++ 1.18/mysql-test/t/openssl_1.test 2007-03-05 10:03:40 +01:00
@@ -1,6 +1,7 @@
-# We test openssl. Result set is optimized to be compiled with --with-openssl.
-# Use mysql-test-run with --with-openssl option.
--- source include/have_openssl.inc
+# Tests for SSL connections, only run if mysqld is compiled
+# with support for SSL.
+
+-- source include/have_ssl.inc
--disable_warnings
drop table if exists t1;
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.2457) | msvensson | 5 Mar |
