bk commit into 5.0 tree (jimw:1.1923)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1923 05/08/01 19:21:56 jimw@stripped +2 -0
  Fix two test results that were merged out-of-order.

  mysql-test/r/user_var.result
    1.36 05/08/01 19:21:52 jimw@stripped +24 -24
    Fix incorrect merge

  mysql-test/r/func_math.result
    1.29 05/08/01 19:21:52 jimw@stripped +10 -0
    Fix incorrect merge of test results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.28/mysql-test/r/func_math.result	2005-08-01 17:54:53 -07:00
+++ 1.29/mysql-test/r/func_math.result	2005-08-01 19:21:52 -07:00
@@ -152,6 +152,16 @@
 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

--- 1.35/mysql-test/r/user_var.result	2005-08-01 17:54:53 -07:00
+++ 1.36/mysql-test/r/user_var.result	2005-08-01 19:21:52 -07:00
@@ -183,6 +183,30 @@
 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 @@
   `@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
-#