bk commit into 5.0 tree (cmiller:1.2248)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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@stripped, 2006-08-10 12:39:18-04:00, cmiller@stripped +6 -0
  Merge updates.

  BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3@stripped, 2006-08-10 12:38:10-04:00, cmiller@stripped +0 -0
    Delete: mysql-test/r/bug20328.result

  BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5@stripped, 2006-08-10 12:27:38-04:00, cmiller@stripped +0 -0
    Delete: mysql-test/t/bug20328.test

  mysql-test/r/grant2.result@stripped, 2006-08-10 10:48:30-04:00, cmiller@stripped +2 -2
    Merge update:  Change between versions, it appears.

  mysql-test/r/heap_btree.result@stripped, 2006-08-10 10:48:30-04:00, cmiller@stripped +10 -10
    Merge update:  Add deterministic ordering of data, as the order is different 
    between versions.

  mysql-test/r/mysql_client.result@stripped, 2006-08-10 10:48:30-04:00, cmiller@stripped +8 -4
    Merge update: Help options changed between versions.

  mysql-test/t/heap_btree.test@stripped, 2006-08-10 10:48:30-04:00, cmiller@stripped +6 -6
    Merge update:  Add deterministic ordering of data, as the order is different 
    between versions.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0

--- 1.21/mysql-test/r/heap_btree.result	2006-08-10 12:39:23 -04:00
+++ 1.22/mysql-test/r/heap_btree.result	2006-08-10 12:39:23 -04:00
@@ -248,34 +248,34 @@
 DROP TABLE t1;
 create table t1(a int not null, key using btree(a)) engine=heap;
 insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);
-select a from t1 where a > 2;
+select a from t1 where a > 2 order by a;
 a
 3
 3
 3
 3
 delete from t1 where a < 4;
-select a from t1;
+select a from t1 order by a;
 a
 insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);
-select a from t1 where a > 4;
+select a from t1 where a > 4 order by a;
 a
 delete from t1 where a > 4;
-select a from t1;
+select a from t1 order by a;
 a
-3
-3
 1
-3
-3
 1
 2
 2
 2
-select a from t1 where a > 3;
+3
+3
+3
+3
+select a from t1 where a > 3 order by a;
 a
 delete from t1 where a >= 2;
-select a from t1;
+select a from t1 order by a;
 a
 1
 1

--- 1.18/mysql-test/t/heap_btree.test	2006-08-10 12:39:23 -04:00
+++ 1.19/mysql-test/t/heap_btree.test	2006-08-10 12:39:23 -04:00
@@ -170,16 +170,16 @@
 
 create table t1(a int not null, key using btree(a)) engine=heap;
 insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);
-select a from t1 where a > 2;
+select a from t1 where a > 2 order by a;
 delete from t1 where a < 4;
-select a from t1;
+select a from t1 order by a;
 insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);
-select a from t1 where a > 4;
+select a from t1 where a > 4 order by a;
 delete from t1 where a > 4;
-select a from t1;
-select a from t1 where a > 3;
+select a from t1 order by a;
+select a from t1 where a > 3 order by a;
 delete from t1 where a >= 2;
-select a from t1;
+select a from t1 order by a;
 drop table t1;
 
 --echo End of 4.1 tests

--- 1.30/mysql-test/r/grant2.result	2006-08-10 12:39:23 -04:00
+++ 1.31/mysql-test/r/grant2.result	2006-08-10 12:39:23 -04:00
@@ -121,9 +121,9 @@
 create database mysqltest_1;
 grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost;
 set sql_log_off = 1;
-ERROR HY000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need the SUPER privilege for this operation
 set sql_log_bin = 0;
-ERROR HY000: Access denied; you need the SUPER privilege for this operation
+ERROR 42000: Access denied; you need the SUPER privilege for this operation
 delete from mysql.user where user like 'mysqltest\_1';
 delete from mysql.db where user like 'mysqltest\_1';
 drop database mysqltest_1;

--- 1.3/mysql-test/r/mysql_client.result	2006-08-10 12:39:23 -04:00
+++ 1.4/mysql-test/r/mysql_client.result	2006-08-10 12:39:23 -04:00
@@ -5,7 +5,7 @@
 ?         (\?) Synonym for `help'.
 clear     (\c) Clear command.
 connect   (\r) Reconnect to the server. Optional arguments are db and host.
-delimiter (\d) Set query delimiter. 
+delimiter (\d) Set statement delimiter. NOTE: Takes the rest of the line as new delimiter.
 edit      (\e) Edit command with $EDITOR.
 ego       (\G) Send command to mysql server, display result vertically.
 exit      (\q) Exit mysql. Same as quit.
@@ -23,11 +23,13 @@
 system    (\!) Execute a system shell command.
 tee       (\T) Set outfile [to_outfile]. Append everything into given outfile.
 use       (\u) Use another database. Takes database name as argument.
-charset_name(\C) Switch to another charset. Might be needed for processing binlog.
+charset   (\C) Switch to another charset. Might be needed for processing binlog with multi-byte charsets.
+warnings  (\W) Show warnings after every statement.
+nowarning (\w) Don't show warnings after every statement.
 ?         (\?) Synonym for `help'.
 clear     (\c) Clear command.
 connect   (\r) Reconnect to the server. Optional arguments are db and host.
-delimiter (\d) Set query delimiter. 
+delimiter (\d) Set statement delimiter. NOTE: Takes the rest of the line as new delimiter.
 edit      (\e) Edit command with $EDITOR.
 ego       (\G) Send command to mysql server, display result vertically.
 exit      (\q) Exit mysql. Same as quit.
@@ -45,7 +47,9 @@
 system    (\!) Execute a system shell command.
 tee       (\T) Set outfile [to_outfile]. Append everything into given outfile.
 use       (\u) Use another database. Takes database name as argument.
-charset_name(\C) Switch to another charset. Might be needed for processing binlog.
+charset   (\C) Switch to another charset. Might be needed for processing binlog with multi-byte charsets.
+warnings  (\W) Show warnings after every statement.
+nowarning (\w) Don't show warnings after every statement.
 \
 \\
 ';