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

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


sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/user_var.test:
  Resolve conflict

mysql-test/r/key_cache.result

@@ -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

@@ -332,7 +332,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

@@ -179,3 +179,27 @@ set session @honk=99;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1
 set one_shot @honk=99;
 ERROR HY000: The SET ONE_SHOT syntax is reserved for purposes internal to the MySQL server
+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

@@ -70,7 +70,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
@@ -407,23 +407,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;

mysql-test/t/user_var.test

@@ -120,4 +120,25 @@ set session @honk=99;
 --error 1105
 set one_shot @honk=99;
 
+#
+# Bug #10724  @@local not preserved in column name of select
+#
+# The value doesn't actually matter, we just care about the column name
+--replace_column 1 #
+select @@local.max_allowed_packet;
+--replace_column 1 #
+select @@session.max_allowed_packet;
+--replace_column 1 #
+select @@global.max_allowed_packet;
+--replace_column 1 #
+select @@max_allowed_packet;
+--replace_column 1 #
+select @@Max_Allowed_Packet;
+--replace_column 1 #
+select @@version;
+--replace_column 1 #
+select @@global.version;
+--replace_column 1 #
+select @@session.VERSION;
+
 # End of 4.1 tests