bk commit into 5.0 tree (bell:1.1995)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell 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.1995 05/08/19 11:38:14 bell@stripped +2 -0
  fixed test after merge

  mysql-test/t/rpl_delete_all.test
    1.6 05/08/19 11:38:10 bell@stripped +1 -1
    fixed test after merge

  mysql-test/r/rpl_delete_all.result
    1.4 05/08/19 11:38:10 bell@stripped +1 -1
    fixed test after merge

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-bug2-5.0

--- 1.3/mysql-test/r/rpl_delete_all.result	2004-08-31 14:34:59 +03:00
+++ 1.4/mysql-test/r/rpl_delete_all.result	2005-08-19 11:38:10 +03:00
@@ -9,7 +9,7 @@
 Warnings:
 Note	1008	Can't drop database 'mysqltest'; database doesn't exist
 show tables from mysqltest;
-ERROR HY000: Can't read dir of './mysqltest/' (Errcode: X)
+ERROR 42000: Unknown database 'mysqltest'
 create table t1 (a int);
 drop table if exists t1;
 Warnings:

--- 1.5/mysql-test/t/rpl_delete_all.test	2005-07-28 03:21:47 +03:00
+++ 1.6/mysql-test/t/rpl_delete_all.test	2005-08-19 11:38:10 +03:00
@@ -7,7 +7,7 @@
 sync_slave_with_master;
 # can't read dir
 --replace_result "Errcode: 1" "Errcode: X" "Errcode: 2" "Errcode: X" \\ /
---error 12
+--error 1049
 show tables from mysqltest;
 
 connection slave;