Commit 79ae20bc authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/t/variables.test:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
scripts/mysqld_multi.sh:
  Resolve conflict
parents 196862df cbb1da77

mysql-test/r/variables.result

+5 −0
Original line number Diff line number Diff line
@@ -513,6 +513,11 @@ SHOW VARIABLES LIKE 'table_cache'; 
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:

mysql-test/t/variables.test

+8 −0
Original line number Diff line number Diff line
@@ -390,6 +390,14 @@ SET GLOBAL table_cache=-1; 
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



#

scripts/mysqld_multi.sh

+6 −1
Original line number Diff line number Diff line
@@ -412,7 +412,12 @@ sub get_mysqladmin_options 
  $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++)

  {

sql/set_var.cc

+10 −4
Original line number Diff line number Diff line
@@ -1725,11 +1725,17 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base) 
    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);

    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 @@ byte *sys_var_character_set::value_ptr(THD *thd, enum_var_type type, 
				       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;

}