bk commit into 5.0 tree (jimw:1.1945)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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
  1.1945 05/09/02 12:42:00 jimw@stripped +4 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  scripts/mysqld_multi.sh
    1.27 05/09/02 12:41:58 jimw@stripped +3 -4
    Resolve conflict

  mysql-test/r/variables.result
    1.72 05/09/02 12:41:58 jimw@stripped +0 -0
    Resolve conflict

  sql/set_var.cc
    1.137 05/09/02 12:40:59 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.48 05/09/02 12:40:59 jimw@stripped +0 -0
    Auto merged

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.26/scripts/mysqld_multi.sh	2005-04-26 07:57:10 -07:00
+++ 1.27/scripts/mysqld_multi.sh	2005-09-02 12:41:58 -07:00
@@ -412,7 +412,12 @@
   $mysqladmin_found= 0 if (!length($mysqladmin));
   $com = "$mysqladmin";
   $tmp = " -u $opt_user";
-  $tmp.= defined($opt_password) ? " -p$opt_password" : "";
+  if (defined($opt_password)) {
+    my $pw= $opt_password;
+    # Protect single quotes in password
+    $pw =~ s/'/'"'"'/g;
+    $tmp.= " -p'$pw'";
+  }
   $tmp.= $opt_tcp_ip ? " -h 127.0.0.1" : "";
   for ($j = 0; defined($options[$j]); $j++)
   {

--- 1.71/mysql-test/r/variables.result	2005-08-30 22:24:55 -07:00
+++ 1.72/mysql-test/r/variables.result	2005-09-02 12:41:58 -07:00
@@ -513,6 +513,11 @@
 Variable_name	Value
 table_cache	1
 SET GLOBAL table_cache=DEFAULT;
+set character_set_results=NULL;
+select ifnull(@@character_set_results,"really null");
+ifnull(@@character_set_results,"really null")
+really null
+set names latin1;
 create table t1 (a int);
 select a into @x from t1;
 Warnings:

--- 1.47/mysql-test/t/variables.test	2005-08-30 22:24:55 -07:00
+++ 1.48/mysql-test/t/variables.test	2005-09-02 12:40:59 -07:00
@@ -390,6 +390,14 @@
 SHOW VARIABLES LIKE 'table_cache';
 SET GLOBAL table_cache=DEFAULT;
 
+#
+# Bugs12363: character_set_results is nullable,
+# but value_ptr returns string "NULL"
+#
+set character_set_results=NULL;
+select ifnull(@@character_set_results,"really null");
+set names latin1;
+
 # End of 4.1 tests
 
 #

--- 1.136/sql/set_var.cc	2005-08-30 22:23:04 -07:00
+++ 1.137/sql/set_var.cc	2005-09-02 12:40:59 -07:00
@@ -1725,11 +1725,17 @@
     return new Item_int((int32) *(my_bool*) value_ptr(thd, var_type, base),1);
   case SHOW_CHAR:
   {
-    Item_string *tmp;
+    Item *tmp;
     pthread_mutex_lock(&LOCK_global_system_variables);
     char *str= (char*) value_ptr(thd, var_type, base);
-    tmp= new Item_string(str, strlen(str),
-                         system_charset_info, DERIVATION_SYSCONST);
+    if (str)
+      tmp= new Item_string(str, strlen(str),
+                           system_charset_info, DERIVATION_SYSCONST);
+    else
+    {
+      tmp= new Item_null();
+      tmp->collation.set(system_charset_info, DERIVATION_SYSCONST);
+    }
     pthread_mutex_unlock(&LOCK_global_system_variables);
     return tmp;
   }
@@ -2019,7 +2025,7 @@
 				       LEX_STRING *base)
 {
   CHARSET_INFO *cs= ci_ptr(thd,type)[0];
-  return cs ? (byte*) cs->csname : (byte*) "NULL";
+  return cs ? (byte*) cs->csname : (byte*) NULL;
 }