Below is the list of changes that have just been committed into a local
5.1 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:11:21+01:00, msvensson@stripped +4 -0
Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781
into pilot.blaudden:/home/msvensson/mysql/bug21781/my51-bug21781
MERGE: 1.1810.2372.135
mysql-test/t/rpl_openssl.test@stripped, 2007-03-05 10:07:58+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.11.1.10
sql/mysql_priv.h@stripped, 2007-03-05 10:11:20+01:00, msvensson@stripped +1 -2
Manual merge
MERGE: 1.290.85.9
sql/mysqld.cc@stripped, 2007-03-05 10:11:20+01:00, msvensson@stripped +1 -2
Manual merge
MERGE: 1.439.82.20
sql/set_var.cc@stripped, 2007-03-05 10:11:20+01:00, msvensson@stripped +2 -4
Manual merge
MERGE: 1.125.22.5
# 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/my51-bug21781/RESYNC
--- 1.485/sql/mysql_priv.h 2007-03-01 14:41:26 +01:00
+++ 1.486/sql/mysql_priv.h 2007-03-05 10:11:20 +01:00
@@ -1702,7 +1702,7 @@ extern handlerton *partition_hton;
extern handlerton *myisam_hton;
extern handlerton *heap_hton;
-extern SHOW_COMP_OPTION have_openssl, have_symlink, have_dlopen;
+extern SHOW_COMP_OPTION 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.623/sql/mysqld.cc 2007-03-01 14:53:30 +01:00
+++ 1.624/sql/mysqld.cc 2007-03-05 10:11:20 +01:00
@@ -568,7 +568,7 @@ CHARSET_INFO *system_charset_info, *file
CHARSET_INFO *national_charset_info, *table_alias_charset;
CHARSET_INFO *character_set_filesystem;
-SHOW_COMP_OPTION have_openssl, have_symlink, have_dlopen, have_query_cache;
+SHOW_COMP_OPTION have_ssl, have_symlink, have_dlopen, have_query_cache;
SHOW_COMP_OPTION have_geometry, have_rtree_keys;
SHOW_COMP_OPTION have_crypt, have_compress;
@@ -3160,12 +3160,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);
@@ -7244,9 +7244,9 @@ static void mysql_init_variables(void)
have_ndbcluster=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.23/mysql-test/t/rpl_openssl.test 2007-02-06 22:01:18 +01:00
+++ 1.24/mysql-test/t/rpl_openssl.test 2007-03-05 10:07:58 +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.218/sql/set_var.cc 2007-03-01 14:41:27 +01:00
+++ 1.219/sql/set_var.cc 2007-03-05 10:11:20 +01:00
@@ -799,7 +799,8 @@ SHOW_VAR init_vars[]= {
{sys_have_geometry.name, (char*) &have_geometry, SHOW_HAVE},
{sys_have_innodb.name, (char*) &have_innodb, SHOW_HAVE},
{sys_have_ndbcluster.name, (char*) &have_ndbcluster, SHOW_HAVE},
- {sys_have_openssl.name, (char*) &have_openssl, SHOW_HAVE},
+ {sys_have_ssl.name, (char*) &have_ssl, SHOW_HAVE},
+ {sys_have_openssl.name, (char*) &have_ssl, SHOW_HAVE},
{sys_have_partition_db.name,(char*) &have_partition_db, SHOW_HAVE},
{sys_have_query_cache.name, (char*) &have_query_cache, SHOW_HAVE},
{sys_have_rtree_keys.name, (char*) &have_rtree_keys, SHOW_HAVE},
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2488) | msvensson | 5 Mar |
