MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:March 5 2007 10:51am
Subject:bk commit into 5.0 tree (msvensson:1.2462)
View as plain text  
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 11:50:59+01:00, msvensson@stripped +3 -0
  Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.2456.1.3

  sql/mysql_priv.h@stripped, 2007-03-05 11:50:56+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.429.2.9

  sql/mysqld.cc@stripped, 2007-03-05 11:50:56+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.582.1.20

  sql/set_var.cc@stripped, 2007-03-05 11:50:57+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.176.1.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/mysql-5.0-maint/RESYNC

--- 1.435/sql/mysql_priv.h	2007-03-01 17:59:53 +01:00
+++ 1.436/sql/mysql_priv.h	2007-03-05 11:50:56 +01:00
@@ -1397,7 +1397,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.594/sql/mysqld.cc	2007-03-01 19:10:05 +01:00
+++ 1.595/sql/mysqld.cc	2007-03-05 11:50:56 +01:00
@@ -496,7 +496,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;
 
@@ -3046,12 +3046,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);
@@ -6621,9 +6621,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.180/sql/set_var.cc	2007-03-01 17:59:53 +01:00
+++ 1.181/sql/set_var.cc	2007-03-05 11:50:57 +01:00
@@ -871,7 +871,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},
Thread
bk commit into 5.0 tree (msvensson:1.2462)msvensson5 Mar