Merge mysql.com:/home/hf/work/embt/my50-embt

into  mysql.com:/home/hf/work/embt/my51-embt


libmysqld/lib_sql.cc:
  Auto merged
BitKeeper/deleted/.del-bdb.result:
  Auto merged
BitKeeper/deleted/.del-bdb.test:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  merging
mysql-test/r/flush_block_commit.result:
  SCCS merged
mysql-test/r/insert.result:
  merging
mysql-test/t/innodb.test:
  merging
mysql-test/t/insert.test:
  merging
sql/share/errmsg.txt:
  merging

1 files changed, 0 insertions, 100 deletions

diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
index 95ada9d37be..b6c02869914 100644
--- a/mysql-test/r/insert_select.result
+++ b/mysql-test/r/insert_select.result
@@ -705,103 +705,3 @@ use bug21774_1;
 INSERT INTO bug21774_2.t1 SELECT t1.* FROM t1;
 DROP DATABASE bug21774_1;
 DROP DATABASE bug21774_2;
-CREATE DATABASE meow;
-CREATE TABLE table_target   ( mexs_id CHAR(8), messzeit TIMESTAMP, PRIMARY KEY (mexs_id));
-CREATE TABLE table_target2  ( mexs_id CHAR(8), messzeit TIMESTAMP, PRIMARY KEY (mexs_id));
-CREATE TABLE table_target3  ( mexs_id CHAR(8), messzeit TIMESTAMP, PRIMARY KEY (mexs_id));
-CREATE VIEW view_target2 AS SELECT mexs_id,messzeit FROM table_target2;
-CREATE SQL SECURITY INVOKER VIEW view_target3 AS SELECT mexs_id,messzeit FROM table_target3;
-CREATE TABLE table_stations ( mexs_id VARCHAR(8), icao VARCHAR(4), country CHAR(2), PRIMARY KEY (mexs_id), UNIQUE KEY icao (icao), KEY country (country), CONSTRAINT stations_ibfk_8 FOREIGN KEY (country) REFERENCES countries (country) ON UPDATE CASCADE);
-INSERT INTO table_stations VALUES ('87654321','XXXX','YY');
-CREATE TABLE table_countries ( country CHAR(2), iso_short_en VARCHAR(64), PRIMARY KEY (country));
-INSERT INTO table_countries VALUES ('YY','Entenhausen');
-CREATE ALGORITHM=MERGE SQL SECURITY INVOKER VIEW view_stations AS select table_stations.mexs_id AS mexs_id, table_stations.icao AS icao, table_stations.country AS landescode from (table_stations join table_countries on((table_stations.country = table_countries.country)));
-CREATE TABLE table_source ( id varchar(4), datetime TIMESTAMP, PRIMARY KEY (id));
-INSERT INTO  table_source VALUES ('XXXX','2006-07-12 07:50:00');
-GRANT  SELECT                ON table_source    TO   user20989@localhost;
-GRANT  SELECT                ON table_countries TO   user20989@localhost;
-GRANT  SELECT                ON table_stations  TO   user20989@localhost;
-GRANT  SELECT                ON view_stations   TO   user20989@localhost;
-GRANT  SELECT                ON table_target    TO   user20989@localhost;
-GRANT  SELECT                ON table_target2   TO   user20989@localhost;
-GRANT  INSERT,DELETE,SELECT  ON view_target3    TO   user20989@localhost;
-REPLACE INTO    table_target
-SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
-FROM            table_source
-INNER JOIN      view_stations AS stations
-ON              table_source.id = stations.icao
-LEFT JOIN       table_target AS old
-USING           (mexs_id);
-ERROR 42000: INSERT,DELETE command denied to user 'user20989'@'localhost' for table 'table_target'
-REPLACE INTO    view_target2
-SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
-FROM            table_source
-INNER JOIN      view_stations AS stations
-ON              table_source.id = stations.icao
-LEFT JOIN       view_target2 AS old
-USING           (mexs_id);
-ERROR 42000: INSERT,DELETE command denied to user 'user20989'@'localhost' for table 'view_target2'
-REPLACE INTO    view_target3
-SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
-FROM            table_source
-INNER JOIN      view_stations AS stations
-ON              table_source.id = stations.icao
-LEFT JOIN       view_target3 AS old
-USING           (mexs_id);
-ERROR HY000: View 'meow.view_target3' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-GRANT  INSERT,DELETE         ON table_target    TO   user20989@localhost;
-GRANT  INSERT,DELETE,SELECT  ON view_target2    TO   user20989@localhost;
-GRANT  INSERT,DELETE,SELECT  ON table_target3   TO   user20989@localhost;
-REPLACE INTO    table_target
-SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
-FROM            table_source
-INNER JOIN      view_stations AS stations
-ON              table_source.id = stations.icao
-LEFT JOIN       table_target AS old
-USING           (mexs_id);
-REPLACE INTO    table_target2 VALUES ('00X45Y78','2006-07-12 07:50:00');
-ERROR 42000: INSERT,DELETE command denied to user 'user20989'@'localhost' for table 'table_target2'
-REPLACE INTO    view_target2  VALUES ('12X45Y78','2006-07-12 07:50:00');
-SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
-FROM            table_source
-INNER JOIN      view_stations AS stations
-ON              table_source.id = stations.icao
-LEFT JOIN       view_target2 AS old
-USING           (mexs_id);
-mexs_id	messzeit
-87654321	2006-07-12 07:50:00
-REPLACE INTO    view_target2
-SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
-FROM            table_source
-INNER JOIN      view_stations AS stations
-ON              table_source.id = stations.icao
-LEFT JOIN       view_target2 AS old
-USING           (mexs_id);
-REPLACE INTO    view_target3
-SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
-FROM            table_source
-INNER JOIN      view_stations AS stations
-ON              table_source.id = stations.icao
-LEFT JOIN       view_target3 AS old
-USING           (mexs_id);
-SELECT * FROM table_target;
-mexs_id	messzeit
-87654321	2006-07-12 07:50:00
-SELECT * FROM view_target2;
-mexs_id	messzeit
-12X45Y78	2006-07-12 07:50:00
-87654321	2006-07-12 07:50:00
-SELECT * FROM view_target3;
-mexs_id	messzeit
-87654321	2006-07-12 07:50:00
-DROP VIEW  view_stations;
-DROP TABLE table_source;
-DROP TABLE table_countries;
-DROP TABLE table_stations;
-DROP TABLE table_target;
-DROP TABLE table_target2;
-DROP TABLE table_target3;
-DROP VIEW  view_target2;
-DROP VIEW  view_target3;
-DROP USER  user20989@localhost;
-DROP DATABASE meow;