Commit 3d53c870 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/my_manage.c:
  Auto merged
mysql-test/mysql_test_run_new.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflicts
mysql-test/t/variables.test:
  Resolve conflicts
sql/sql_acl.cc:
  Resolve conflicts
strings/ctype-simple.c:
  Resolve conflicts
strings/ctype-ucs2.c:
  Resolve conflicts
parents f8bfae6b c3ac502a

mysql-test/my_manage.c

+4 −1
Original line number Diff line number Diff line
@@ -230,7 +230,10 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)), 
                          char *user, char *password, int port,char *tmp_dir)

{

  arg_list_t al;

  int err= 0, i;

  int err= 0;

#ifndef __WIN__

  int i;

#endif

  char trash[FN_REFLEN];



  /* mysqladmin file */

mysql-test/mysql_test_run_new.c

+0 −1
Original line number Diff line number Diff line
@@ -1741,7 +1741,6 @@ int main(int argc, char **argv) 
      int* handle;

      char test[FN_LEN];

      char mask[FN_REFLEN];

      char *p;

      int position;



      /* single test */

mysql-test/r/variables.result

+8 −3
Original line number Diff line number Diff line
@@ -518,6 +518,14 @@ select ifnull(@@character_set_results,"really null"); 
ifnull(@@character_set_results,"really null")

really null

set names latin1;

select @@have_innodb;

@@have_innodb

#

set @test = @@query_prealloc_size;

set @@query_prealloc_size = @test;

select @@query_prealloc_size = @test;

@@query_prealloc_size = @test

1

create table t1 (a int);

select a into @x from t1;

Warnings:
@@ -542,9 +550,6 @@ set @@max_heap_table_size= 4294967296; 
select @@max_heap_table_size > 0;

@@max_heap_table_size > 0

1

select @@have_innodb;

@@have_innodb

#

select @@character_set_system;

@@character_set_system

utf8

mysql-test/t/variables.test

+17 −7
Original line number Diff line number Diff line
@@ -398,6 +398,21 @@ set character_set_results=NULL; 
select ifnull(@@character_set_results,"really null");

set names latin1;





#

# Bug #9613: @@have_innodb

#



--replace_column 1 #

select @@have_innodb;



#

# Bug #13334: query_prealloc_size default less than minimum

#

set @test = @@query_prealloc_size;

set @@query_prealloc_size = @test;

select @@query_prealloc_size = @test;



# End of 4.1 tests



#
@@ -429,13 +444,6 @@ select @@max_heap_table_size > 0; 
set @@max_heap_table_size= 4294967296;

select @@max_heap_table_size > 0;



#

# Bug #9613: @@have_innodb

#



--replace_column 1 #

select @@have_innodb;



#

# Bug #11775 Variable character_set_system does not exist (sometimes)

#
@@ -444,3 +452,5 @@ select @@character_set_system; 
set global character_set_system = latin1;

--error 1238

set @@global.version_compile_os='234';



# End of 5.0 tests

sql/item_func.cc

+0 −1
Original line number Diff line number Diff line
@@ -4503,7 +4503,6 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name, 
		     LEX_STRING component)

{

  sys_var *var;

  char buff[MAX_SYS_VAR_LENGTH*2+4+8], *pos;

  LEX_STRING *base_name, *component_name;



  if (component.str == 0 &&