From 62771338ca94eee0dfd23a2d5c2fab0269ff1508 Mon Sep 17 00:00:00 2001
From: "monty@donna.mysql.com" <>
Date: Sun, 21 Jan 2001 16:30:16 +0200
Subject: Changes for --with-server-suffix Fixed mutex bug in logging (crash on
 windows when doing SET PASSWORD=) Changed MERGE  tables to not use FILE

---
 mysql-test/Makefile.am    |   3 +--
 mysql-test/r/merge.result |   2 +-
 mysql-test/std_data/m.MRG |   0
 mysql-test/std_data/m.frm | Bin 8548 -> 0 bytes
 mysql-test/t/merge.test   |   5 +++--
 5 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 mysql-test/std_data/m.MRG
 delete mode 100644 mysql-test/std_data/m.frm

(limited to 'mysql-test')

diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 93804c4699b..d59250fbca5 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -30,8 +30,7 @@ dist-hook:
 	cp -p $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t
 	cp -p $(srcdir)/include/*.inc $(distdir)/include
 	cp -p $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r
-	cp -p $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.frm \
-$(srcdir)/std_data/*.MRG  $(distdir)/std_data
+	cp -p $(srcdir)/std_data/*.dat $(distdir)/std_data
 
 install-data-local:
 	$(mkinstalldirs) \
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 5135ce0c9e9..5ef58bcef3f 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -106,4 +106,4 @@ incr	othr
 2	24
 4	33
 3	53
-c
+a
diff --git a/mysql-test/std_data/m.MRG b/mysql-test/std_data/m.MRG
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mysql-test/std_data/m.frm b/mysql-test/std_data/m.frm
deleted file mode 100644
index fc684891d9e..00000000000
Binary files a/mysql-test/std_data/m.frm and /dev/null differ
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index a4b4b5c8178..a3b2c8a11de 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -75,5 +75,6 @@ drop table t3,t2,t1;
 #
 # Test table without unions
 #
-select * from m;
-
+create table t1 (a int not null) type=merge;
+select * from t1;
+drop table t1;
-- 
cgit v1.2.1