Fix for funcs_1 tests which fail in 5.0.60

This is basically a backport of changes (only a few were missing)
which were already pushed to 5.0-build and upmerged to
5.1-build, 6.0-build


mysql-test/std_data/funcs_1/innodb_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb1.txt -> mysql-test/std_data/funcs_1/innodb_tb1.txt
mysql-test/std_data/funcs_1/innodb_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb2.txt -> mysql-test/std_data/funcs_1/innodb_tb2.txt
mysql-test/std_data/funcs_1/innodb_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb3.txt -> mysql-test/std_data/funcs_1/innodb_tb3.txt
mysql-test/std_data/funcs_1/innodb_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb4.txt -> mysql-test/std_data/funcs_1/innodb_tb4.txt
mysql-test/std_data/funcs_1/memory_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb1.txt -> mysql-test/std_data/funcs_1/memory_tb1.txt
mysql-test/std_data/funcs_1/memory_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb2.txt -> mysql-test/std_data/funcs_1/memory_tb2.txt
mysql-test/std_data/funcs_1/memory_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb3.txt -> mysql-test/std_data/funcs_1/memory_tb3.txt
mysql-test/std_data/funcs_1/memory_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb4.txt -> mysql-test/std_data/funcs_1/memory_tb4.txt
mysql-test/std_data/funcs_1/myisam_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb1.txt -> mysql-test/std_data/funcs_1/myisam_tb1.txt
mysql-test/std_data/funcs_1/myisam_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb2.txt -> mysql-test/std_data/funcs_1/myisam_tb2.txt
mysql-test/std_data/funcs_1/myisam_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb3.txt -> mysql-test/std_data/funcs_1/myisam_tb3.txt
mysql-test/std_data/funcs_1/myisam_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb4.txt -> mysql-test/std_data/funcs_1/myisam_tb4.txt
mysql-test/std_data/funcs_1/t3.txt:
  Rename: mysql-test/suite/funcs_1/data/t3.txt -> mysql-test/std_data/funcs_1/t3.txt
mysql-test/std_data/funcs_1/t4.txt:
  Rename: mysql-test/suite/funcs_1/data/t4.txt -> mysql-test/std_data/funcs_1/t4.txt
mysql-test/std_data/funcs_1/t7.txt:
  Rename: mysql-test/suite/funcs_1/data/t7.txt -> mysql-test/std_data/funcs_1/t7.txt
mysql-test/std_data/funcs_1/t9.txt:
  Rename: mysql-test/suite/funcs_1/data/t9.txt -> mysql-test/std_data/funcs_1/t9.txt
mysql-test/Makefile.am:
  Correction for location of loadfiles
mysql-test/std_data/funcs_1/load_file.txt:
  Missing file

18 files changed, 3 insertions, 2 deletions

diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index c65c2fd82a4..0dee970cd58 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -46,7 +46,7 @@ dist-hook:
 		$(distdir)/std_data \
 		$(distdir)/std_data/ndb_backup50_data_be $(distdir)/std_data/ndb_backup50_data_le \
 		$(distdir)/lib \
-		$(distdir)/funcs_1
+		$(distdir)/std_data/funcs_1
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
 	-$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t
@@ -80,7 +80,7 @@ install-data-local:
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \
 		$(DESTDIR)$(testdir)/lib \
-		$(DESTDIR)$(testdir)/funcs_1
+		$(DESTDIR)$(testdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
diff --git a/mysql-test/suite/funcs_1/data/innodb_tb1.txt b/mysql-test/std_data/funcs_1/innodb_tb1.txt
index 4c20ed1661b..4c20ed1661b 100644
--- a/mysql-test/suite/funcs_1/data/innodb_tb1.txt
+++ b/mysql-test/std_data/funcs_1/innodb_tb1.txt
diff --git a/mysql-test/suite/funcs_1/data/innodb_tb2.txt b/mysql-test/std_data/funcs_1/innodb_tb2.txt
index 8ae7dea6df4..8ae7dea6df4 100644
--- a/mysql-test/suite/funcs_1/data/innodb_tb2.txt
+++ b/mysql-test/std_data/funcs_1/innodb_tb2.txt
diff --git a/mysql-test/suite/funcs_1/data/innodb_tb3.txt b/mysql-test/std_data/funcs_1/innodb_tb3.txt
index a01cc36da54..a01cc36da54 100644
--- a/mysql-test/suite/funcs_1/data/innodb_tb3.txt
+++ b/mysql-test/std_data/funcs_1/innodb_tb3.txt
diff --git a/mysql-test/suite/funcs_1/data/innodb_tb4.txt b/mysql-test/std_data/funcs_1/innodb_tb4.txt
index 5092371d093..5092371d093 100644
--- a/mysql-test/suite/funcs_1/data/innodb_tb4.txt
+++ b/mysql-test/std_data/funcs_1/innodb_tb4.txt
diff --git a/mysql-test/std_data/funcs_1/load_file.txt b/mysql-test/std_data/funcs_1/load_file.txt
new file mode 100644
index 00000000000..930ac1cf371
--- /dev/null
+++ b/mysql-test/std_data/funcs_1/load_file.txt
@@ -0,0 +1 @@
+Here is content from load_file
diff --git a/mysql-test/suite/funcs_1/data/memory_tb1.txt b/mysql-test/std_data/funcs_1/memory_tb1.txt
index e266c70f9b8..e266c70f9b8 100644
--- a/mysql-test/suite/funcs_1/data/memory_tb1.txt
+++ b/mysql-test/std_data/funcs_1/memory_tb1.txt
diff --git a/mysql-test/suite/funcs_1/data/memory_tb2.txt b/mysql-test/std_data/funcs_1/memory_tb2.txt
index 8ae7dea6df4..8ae7dea6df4 100644
--- a/mysql-test/suite/funcs_1/data/memory_tb2.txt
+++ b/mysql-test/std_data/funcs_1/memory_tb2.txt
diff --git a/mysql-test/suite/funcs_1/data/memory_tb3.txt b/mysql-test/std_data/funcs_1/memory_tb3.txt
index 2c0433304a8..2c0433304a8 100644
--- a/mysql-test/suite/funcs_1/data/memory_tb3.txt
+++ b/mysql-test/std_data/funcs_1/memory_tb3.txt
diff --git a/mysql-test/suite/funcs_1/data/memory_tb4.txt b/mysql-test/std_data/funcs_1/memory_tb4.txt
index 5a0f0da3415..5a0f0da3415 100644
--- a/mysql-test/suite/funcs_1/data/memory_tb4.txt
+++ b/mysql-test/std_data/funcs_1/memory_tb4.txt
diff --git a/mysql-test/suite/funcs_1/data/myisam_tb1.txt b/mysql-test/std_data/funcs_1/myisam_tb1.txt
index da21f6c71d0..da21f6c71d0 100644
--- a/mysql-test/suite/funcs_1/data/myisam_tb1.txt
+++ b/mysql-test/std_data/funcs_1/myisam_tb1.txt
diff --git a/mysql-test/suite/funcs_1/data/myisam_tb2.txt b/mysql-test/std_data/funcs_1/myisam_tb2.txt
index 4fb43f72a1c..4fb43f72a1c 100644
--- a/mysql-test/suite/funcs_1/data/myisam_tb2.txt
+++ b/mysql-test/std_data/funcs_1/myisam_tb2.txt
diff --git a/mysql-test/suite/funcs_1/data/myisam_tb3.txt b/mysql-test/std_data/funcs_1/myisam_tb3.txt
index 785e51e6b95..785e51e6b95 100644
--- a/mysql-test/suite/funcs_1/data/myisam_tb3.txt
+++ b/mysql-test/std_data/funcs_1/myisam_tb3.txt
diff --git a/mysql-test/suite/funcs_1/data/myisam_tb4.txt b/mysql-test/std_data/funcs_1/myisam_tb4.txt
index 510c6bd3cf9..510c6bd3cf9 100644
--- a/mysql-test/suite/funcs_1/data/myisam_tb4.txt
+++ b/mysql-test/std_data/funcs_1/myisam_tb4.txt
diff --git a/mysql-test/suite/funcs_1/data/t3.txt b/mysql-test/std_data/funcs_1/t3.txt
index a2287c20d43..a2287c20d43 100644
--- a/mysql-test/suite/funcs_1/data/t3.txt
+++ b/mysql-test/std_data/funcs_1/t3.txt
diff --git a/mysql-test/suite/funcs_1/data/t4.txt b/mysql-test/std_data/funcs_1/t4.txt
index 4e2ab19b47c..4e2ab19b47c 100644
--- a/mysql-test/suite/funcs_1/data/t4.txt
+++ b/mysql-test/std_data/funcs_1/t4.txt
diff --git a/mysql-test/suite/funcs_1/data/t7.txt b/mysql-test/std_data/funcs_1/t7.txt
index e3c9aa4c58f..e3c9aa4c58f 100644
--- a/mysql-test/suite/funcs_1/data/t7.txt
+++ b/mysql-test/std_data/funcs_1/t7.txt
diff --git a/mysql-test/suite/funcs_1/data/t9.txt b/mysql-test/std_data/funcs_1/t9.txt
index bac7a54fee5..bac7a54fee5 100644
--- a/mysql-test/suite/funcs_1/data/t9.txt
+++ b/mysql-test/std_data/funcs_1/t9.txt