bk commit into 5.1 tree (tomas:1.1951)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1951 05/06/08 02:19:53 tomas@stripped +2 -0
  fixed error codes back as in 5.0

  mysql-test/t/grant3.test
    1.7 05/06/08 02:19:47 tomas@stripped +1 -1
    fixed error codes back as in 5.0

  mysql-test/t/gis.test
    1.21 05/06/08 02:19:47 tomas@stripped +6 -6
    fixed error codes back as in 5.0

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-wl1354-new

--- 1.6/mysql-test/t/grant3.test	2005-06-02 06:36:39 +02:00
+++ 1.7/mysql-test/t/grant3.test	2005-06-08 02:19:47 +02:00
@@ -23,7 +23,7 @@
 grant select on `my\_1`.* to mysqltest_1@localhost with grant option;
 connect (user_a,localhost,mysqltest_1,,);
 connection user_a;
---error 1438
+--error 1410
 grant select on `my\_1`.* to mysqltest_2@localhost;
 create user mysqltest_2@localhost;
 disconnect user_a;

--- 1.20/mysql-test/t/gis.test	2005-06-02 06:36:39 +02:00
+++ 1.21/mysql-test/t/gis.test	2005-06-08 02:19:47 +02:00
@@ -165,9 +165,9 @@
 
 create table t1 (a geometry not null);
 insert into t1 values (GeomFromText('Point(1 2)'));
--- error 1444
+-- error 1416
 insert into t1 values ('Garbage');
--- error 1444
+-- error 1416
 insert IGNORE into t1 values ('Garbage');
 alter table t1 add spatial index(a);
 
@@ -361,13 +361,13 @@
 drop table t1;
 
 create table t1 (fl geometry);
---error 1444
+--error 1416
 insert into t1 values (1);
---error 1444
+--error 1416
 insert into t1 values (1.11);
---error 1444
+--error 1416
 insert into t1 values ("qwerty");
---error 1444
+--error 1416
 insert into t1 values (pointfromtext('point(1,1)'));
 
 drop table t1;