Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  trift2.:/MySQL/M51/test-help-5.1

mysql-test/install_test_db.sh

@@ -22,7 +22,7 @@ if [ x$1 = x"--bin" ]; then
   BINARY_DIST=1
 
   bindir=../bin
-  scriptdir=../bin
+  scriptdir=bin
   libexecdir=../libexec
 
   # Check if it's a binary distribution or a 'make install'
@@ -33,7 +33,7 @@ if [ x$1 = x"--bin" ]; then
   then
     execdir=../../sbin
     bindir=../../bin
-    scriptdir=../../bin
+    scriptdir=../bin
     libexecdir=../../libexec
   else
     execdir=../bin
@@ -43,7 +43,7 @@ else
   execdir=../sql
   bindir=../client
   fix_bin=.
-  scriptdir=../scripts
+  scriptdir=scripts
   libexecdir=../libexec
 fi
 
@@ -99,15 +99,14 @@ if [ x$BINARY_DIST = x1 ] ; then
 basedir=..
 else
 basedir=.
-EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"
+EXTRA_ARG="--windows"
 fi
 
-mysqld_boot="${MYSQLD_BOOTSTRAP-$mysqld}"
+INSTALL_CMD="$scriptdir/mysql_install_db --no-defaults $EXTRA_ARG --basedir=$basedir --datadir=mysql-test/$ldata --srcdir=."
+echo "running $INSTALL_CMD"
 
-mysqld_boot="$mysqld_boot --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG"
-echo "running $mysqld_boot"
-
-if $scriptdir/mysql_create_system_tables test $mdata $hostname | $mysqld_boot
+cd ..
+if $INSTALL_CMD
 then
     exit 0
 else

mysql-test/mysql-test-run.pl

@@ -1495,9 +1495,17 @@ sub executable_setup () {
 
   if (!$opt_extern)
   {
-  # Look for SQL scripts directory
-  $path_sql_dir= mtr_path_exists("$glob_basedir/share",
-				 "$glob_basedir/scripts");
+    # Look for SQL scripts directory
+    if ( mtr_file_exists("$path_share/mysql_system_tables.sql") ne "")
+    {
+      # The SQL scripts are in path_share
+      $path_sql_dir= $path_share;
+    }
+    else
+    {
+      $path_sql_dir= mtr_path_exists("$glob_basedir/share",
+				     "$glob_basedir/scripts");
+    }
 
     if ( $mysql_version_id >= 50100 )
     {

mysql-test/r/delayed.result

@@ -250,3 +250,8 @@ SELECT HEX(a) FROM t1;
 HEX(a)
 1
 DROP TABLE t1;
+CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
+CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);
+INSERT DELAYED INTO t2 VALUES(1);
+ERROR HY000: Table storage engine for 't2' doesn't have this option
+DROP TABLE t1, t2;

mysql-test/r/merge.result

@@ -806,11 +806,6 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1);
 SELECT * FROM tm1;
 ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
 DROP TABLE t1, tm1;
-CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
-CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);
-INSERT DELAYED INTO t2 VALUES(1);
-ERROR HY000: Table storage engine for 't2' doesn't have this option
-DROP TABLE t1, t2;
 CREATE TABLE t1(c1 VARCHAR(1));
 CREATE TABLE m1 LIKE t1;
 ALTER TABLE m1 ENGINE=MERGE UNION=(t1);

mysql-test/r/trigger.result

@@ -1398,18 +1398,19 @@ id	val
 1	test1
 2	test2
 INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val);
-INSERT INTO t1 VALUES (3,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);
+INSERT INTO t1 VALUES (2,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);
+INSERT INTO t1 VALUES (3,'test4') ON DUPLICATE KEY UPDATE val=VALUES(val);
 SELECT * FROM t1;
 id	val
 1	test1
-2	test2
-3	test3
+2	test3
+3	test4
 SELECT * FROM t2;
 id	val
 1	test1
 2	test2
-3	test2
-4	test3
+3	test3
+4	test4
 DROP TRIGGER trg27006_a_insert;
 DROP TRIGGER trg27006_a_update;
 drop table t1,t2;

mysql-test/t/delayed.test

@@ -242,3 +242,13 @@ INSERT DELAYED INTO t1 VALUES(1);
 FLUSH TABLE t1;
 SELECT HEX(a) FROM t1;
 DROP TABLE t1;
+
+#
+# Bug#26464 - insert delayed + update + merge = corruption
+#
+CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
+CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);
+--error 1031
+INSERT DELAYED INTO t2 VALUES(1);
+DROP TABLE t1, t2;
+

mysql-test/t/init_connect.test

@@ -2,10 +2,11 @@
 # Test of init_connect variable
 #
 
+# should work with embedded server after mysqltest is fixed
+--source include/not_embedded.inc
+
 --source include/add_anonymous_users.inc
 
-# should work with embedded server after mysqltest is fixed
--- source include/not_embedded.inc
 connect (con0,localhost,root,,);
 connection con0;
 select hex(@a);

mysql-test/t/merge.test

@@ -434,16 +434,7 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1);
 SELECT * FROM tm1;
 DROP TABLE t1, tm1;
 
-#
-# Bug#26464 - insert delayed + update + merge = corruption
-#
-CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
-CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);
---error 1031
-INSERT DELAYED INTO t2 VALUES(1);
-DROP TABLE t1, t2;
 
-#
 # BUG#26881 - Large MERGE tables report incorrect specification when no
 #             differences in tables
 #

mysql-test/t/trigger.test

@@ -1700,8 +1700,7 @@ DROP PROCEDURE bug22580_proc_1;
 DROP PROCEDURE bug22580_proc_2;
 
 #
-# Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
-#            UPDATE if the row wasn't actually changed.
+# Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE
 #
 --disable_warnings
 DROP TRIGGER IF EXISTS trg27006_a_update;
@@ -1730,7 +1729,8 @@ INSERT INTO t1(val) VALUES ('test1'),('test2');
 SELECT * FROM t1;
 SELECT * FROM t2;
 INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val);
-INSERT INTO t1 VALUES (3,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);
+INSERT INTO t1 VALUES (2,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);
+INSERT INTO t1 VALUES (3,'test4') ON DUPLICATE KEY UPDATE val=VALUES(val);
 SELECT * FROM t1;
 SELECT * FROM t2;
 DROP TRIGGER trg27006_a_insert;