From 421dd5f1c27109ca84dd1d1ce92c8d9559773e3b Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Mon, 1 Aug 2005 19:21:56 -0700
Subject: [PATCH] Fix two test results that were merged out-of-order.

mysql-test/r/func_math.result:
  Fix incorrect merge of test results
mysql-test/r/user_var.result:
  Fix incorrect merge
---
 mysql-test/r/func_math.result | 10 ++++++++
 mysql-test/r/user_var.result  | 48 +++++++++++++++++------------------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index c84b26ce24e..0149911e36b 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -152,6 +152,16 @@ ceil(0.09)
 select ceil(0.000000000000000009);
 ceil(0.000000000000000009)
 1
+create table t1 select round(1, 6);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `round(1, 6)` decimal(7,6) NOT NULL default '0.000000'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+select * from t1;
+round(1, 6)
+1.000000
+drop table t1;
 select abs(-2) * -2;
 abs(-2) * -2
 -4
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
index 893e024719b..acdc793fb69 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/r/user_var.result
@@ -183,6 +183,30 @@ 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
+#
 set @first_var= NULL;
 create table t1 select @first_var;
 show create table t1;
@@ -224,27 +248,3 @@ 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
-#