bk commit into 5.0 tree (guilhem:1.1934)

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem 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.1934 05/09/05 13:26:38 guilhem@stripped +3 -0
  WL#1012: manual fixes after merge of 5.0 into 5.0-wl1012.

  mysql-test/r/rpl_loadfile.result
    1.2 05/09/05 13:26:34 guilhem@stripped +0 -4
    I don't get the warnings and they should not be there (table and routine are expected
to exist);
    so if the warnings happen for somebody, consider it a test failure to be fixed.

  mysql-test/r/rpl_LD_INFILE.result
    1.2 05/09/05 13:26:34 guilhem@stripped +0 -4
    I don't get the warnings and it's normal as there is --disable_warnings. So I remove
them.

  mysql-test/r/innodb.result
    1.128 05/09/05 13:26:34 guilhem@stripped +39 -0
    fix 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.0-wl1012

--- 1.1/mysql-test/r/rpl_LD_INFILE.result	2005-08-25 12:39:19 +02:00
+++ 1.2/mysql-test/r/rpl_LD_INFILE.result	2005-09-05 13:26:34 +02:00
@@ -5,11 +5,7 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 DROP PROCEDURE IF EXISTS test.p1;
-Warnings:
-Note	1305	PROCEDURE p1 does not exist
 DROP TABLE IF EXISTS test.t1;
-Warnings:
-Note	1051	Unknown table 't1'
 CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));
 LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE a = 'abashed';

--- 1.1/mysql-test/r/rpl_loadfile.result	2005-08-25 12:55:59 +02:00
+++ 1.2/mysql-test/r/rpl_loadfile.result	2005-09-05 13:26:34 +02:00
@@ -5,11 +5,7 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 DROP PROCEDURE IF EXISTS test.p1;
-Warnings:
-Note	1305	PROCEDURE p1 does not exist
 DROP TABLE IF EXISTS test.t1;
-Warnings:
-Note	1051	Unknown table 't1'
 CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a));
 INSERT INTO test.t1  VALUES(1,'test');
 UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=1;

--- 1.127/mysql-test/r/innodb.result	2005-09-05 11:36:40 +02:00
+++ 1.128/mysql-test/r/innodb.result	2005-09-05 13:26:34 +02:00
@@ -1680,6 +1680,22 @@
 3	NULL
 DROP TABLE t2;
 DROP TABLE t1;
+create temporary table t1 (a int) engine=innodb;
+insert into t1 values (4711);
+truncate t1;
+insert into t1 values (42);
+select * from t1;
+a
+42
+drop table t1;
+create table t1 (a int) engine=innodb;
+insert into t1 values (4711);
+truncate t1;
+insert into t1 values (42);
+select * from t1;
+a
+42
+drop table t1;
 create table t1 (x bigint unsigned not null primary key) engine=innodb;
 insert into t1(x) values (0xfffffffffffffff0),(0xfffffffffffffff1);
 select * from t1;
@@ -2450,3 +2466,26 @@
 select * from t1;
 f1	f2
 drop table t1,t2;
+CREATE TABLE t1 (
+id INTEGER NOT NULL AUTO_INCREMENT, PRIMARY KEY (id)
+) ENGINE=InnoDB;
+CREATE TABLE t2 (
+id INTEGER NOT NULL,
+FOREIGN KEY (id) REFERENCES t1 (id)
+) ENGINE=InnoDB;
+INSERT INTO t1 (id) VALUES (NULL);
+SELECT * FROM t1;
+id
+1
+TRUNCATE t1;
+INSERT INTO t1 (id) VALUES (NULL);
+SELECT * FROM t1;
+id
+1
+DELETE FROM t1;
+TRUNCATE t1;
+INSERT INTO t1 (id) VALUES (NULL);
+SELECT * FROM t1;
+id
+1
+DROP TABLE t2, t1;