Commit d083e4ac 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/r/key_cache.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/func_math.result:
  Resolve conflicts
mysql-test/r/user_var.result:
  Resolve conflicts
mysql-test/t/func_math.test:
  Resolve conflicts
mysql-test/t/user_var.test:
  Resolve conflicts
sql/item_func.cc:
  Resolve conflicts
sql/sql_parse.cc:
  Resolve conflicts
parents 8fc1e27f c679cb67

mysql-test/r/func_math.result

+3 −0
Original line number Diff line number Diff line
@@ -152,3 +152,6 @@ ceil(0.09) 
select ceil(0.000000000000000009);

ceil(0.000000000000000009)

1

select abs(-2) * -2;

abs(-2) * -2

-4

mysql-test/r/key_cache.result

+3 −3
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ SELECT @@global.default.key_buffer_size; 
@@global.default.key_buffer_size

16777216

SELECT @@global.default.`key_buffer_size`;

@@global.default.key_buffer_size

@@global.default.`key_buffer_size`

16777216

SELECT @@global.`default`.`key_buffer_size`;

@@global.default.key_buffer_size

@@global.`default`.`key_buffer_size`

16777216

SELECT @@`default`.key_buffer_size;

@@default.key_buffer_size

@@`default`.key_buffer_size

16777216

SELECT @@small.key_buffer_size;

@@small.key_buffer_size

mysql-test/r/ps_1general.result

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ execute stmt1 ; 
ERROR 42S02: Unknown table 't5'

prepare stmt1 from ' SELECT @@version ' ;

execute stmt1 ;

@@VERSION

@@version

<version>

prepare stmt_do from ' do @var:=  (1 in (select a from t1)) ' ;

prepare stmt_set from ' set @var= (1 in (select a from t1)) ' ;

mysql-test/r/user_var.result

+24 −0
Original line number Diff line number Diff line
@@ -224,3 +224,27 @@ t1 CREATE TABLE `t1` ( 
  `@first_var` longtext

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

select @@local.max_allowed_packet;

@@local.max_allowed_packet

#

select @@session.max_allowed_packet;

@@session.max_allowed_packet

#

select @@global.max_allowed_packet;

@@global.max_allowed_packet

#

select @@max_allowed_packet;

@@max_allowed_packet

#

select @@Max_Allowed_Packet;

@@Max_Allowed_Packet

#

select @@version;

@@version

#

select @@global.version;

@@global.version

#

select @@session.VERSION;

@@session.VERSION

#

mysql-test/r/variables.result

+6 −6
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ Variable_name Value 
max_join_size	HA_POS_ERROR

set @@max_join_size=1000, @@global.max_join_size=2000;

select @@local.max_join_size, @@global.max_join_size;

@@session.max_join_size	@@global.max_join_size

@@local.max_join_size	@@global.max_join_size

1000	2000

select @@identity,  length(@@version)>0;

@@identity	length(@@version)>0
@@ -428,23 +428,23 @@ Variable_name Value 
myisam_max_sort_file_size	MAX_FILE_SIZE

set global myisam_max_sort_file_size=default;

select @@global.max_user_connections,@@local.max_join_size;

@@global.max_user_connections	@@session.max_join_size

@@global.max_user_connections	@@local.max_join_size

100	200

set @svc=@@global.max_user_connections, @svj=@@local.max_join_size;

select @@global.max_user_connections,@@local.max_join_size;

@@global.max_user_connections	@@session.max_join_size

@@global.max_user_connections	@@local.max_join_size

100	200

set @@global.max_user_connections=111,@@local.max_join_size=222;

select @@global.max_user_connections,@@local.max_join_size;

@@global.max_user_connections	@@session.max_join_size

@@global.max_user_connections	@@local.max_join_size

111	222

set @@global.max_user_connections=@@local.max_join_size,@@local.max_join_size=@@global.max_user_connections;

select @@global.max_user_connections,@@local.max_join_size;

@@global.max_user_connections	@@session.max_join_size

@@global.max_user_connections	@@local.max_join_size

222	111

set @@global.max_user_connections=@svc, @@local.max_join_size=@svj;

select @@global.max_user_connections,@@local.max_join_size;

@@global.max_user_connections	@@session.max_join_size

@@global.max_user_connections	@@local.max_join_size

100	200

set @a=1, @b=2;

set @a=@b, @b=@a;