Fix for Tex 3.0

Added target test


Docs/Support/texinfo.tex:
  Fix for Tex 3.0
Makefile.am:
  Added target test
mysql-test/r/type_blob.result:
  Fix problem with ^M
mysql-test/t/type_blob.test:
  Fix problem with ^M

4 files changed, 12 insertions, 6 deletions

diff --git a/Docs/Support/texinfo.tex b/Docs/Support/texinfo.tex
index 7421f884d22..3299693244b 100644
--- a/Docs/Support/texinfo.tex
+++ b/Docs/Support/texinfo.tex
@@ -2317,7 +2317,7 @@ width0pt\relax} \fi
 % **In TeX 3.0, setting text in \nullfont hangs tex.  For a
 % workaround (which requires the file ``dummy.tfm'' to be installed),
 % uncomment the following line:
-%%%%%\font\nullfont=dummy\let\obstexwarn=\relax
+\font\nullfont=dummy\let\obstexwarn=\relax
 
 % Ignore text, except that we keep track of conditional commands for
 % purposes of nesting, up to an `@end #1' command.
diff --git a/Makefile.am b/Makefile.am
index cc8a387ca4f..cdf5ca5d676 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,3 +60,9 @@ bin-dist:		all
 	$(top_builddir)/scripts/make_binary_distribution
 
 .PHONY:		init-db bin-dist
+
+# Test installation
+
+test:
+	cd mysql-test
+	./mysql-test-run
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index dcc31addc47..1daeb4e9f20 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/r/type_blob.result
@@ -242,10 +242,10 @@ HELLO	1
 HELLO MY	1
 a	1
 hello	1
-_field_140	min(t3._field_131)	min(t3._field_135)	min(t3._field_139)	min(t3._field_137)	min(link_alias_142._field_165)	min(link_alias_133._field_72)	min(t3._field_145)	min(link_alias_148._field_156)	replace(min(t3._field_140), "\r","^M")	t3_id
-test
-job
-1	test job 1	0000-00-00 00:00:00	1999-02-25 22:43:32	0	High	admin	0	tomato	test^M
+replace(t3._field_140, "\r","^M")	t3_id	min(t3._field_131)	min(t3._field_135)	min(t3._field_139)	min(t3._field_137)	min(link_alias_142._field_165)	min(link_alias_133._field_72)	min(t3._field_145)	min(link_alias_148._field_156)	replace(min(t3._field_140), "\r","^M")	t3_id
+test^M
+job^M
+1	1	test job 1	0000-00-00 00:00:00	1999-02-25 22:43:32	0	High	admin	0	tomato	test^M
 job^M
 1	1
 stamp
diff --git a/mysql-test/t/type_blob.test b/mysql-test/t/type_blob.test
index 82216fdd904..ab73828c49a 100644
--- a/mysql-test/t/type_blob.test
+++ b/mysql-test/t/type_blob.test
@@ -203,7 +203,7 @@ INSERT INTO t7 VALUES (1,0,'High',1);
 INSERT INTO t7 VALUES (2,0,'Medium',2);
 INSERT INTO t7 VALUES (3,0,'Low',3);
 
-select t3._field_140,min(t3._field_131), min(t3._field_135), min(t3._field_139), min(t3._field_137), min(link_alias_142._field_165), min(link_alias_133._field_72), min(t3._field_145), min(link_alias_148._field_156), replace(min(t3._field_140), "\r","^M"),t3.t3_id from t3 left join t4 on t4.seq_0_id = t3.t3_id left join t7 link_alias_142 on t4.seq_1_id = link_alias_142.t7_id left join t6 on t6.seq_0_id = t3.t3_id left join t1 link_alias_133 on t6.seq_1_id = link_alias_133.t1_id left join t2 on t2.seq_0_id = t3.t3_id left join t5 link_alias_148 on t2.seq_1_id = link_alias_148.t5_id where t3.t3_id in (1) group by t3.t3_id order by link_alias_142._field_166, _field_139, link_alias_133._field_72, _field_135, link_alias_148._field_156;
+select replace(t3._field_140, "\r","^M"),t3_id,min(t3._field_131), min(t3._field_135), min(t3._field_139), min(t3._field_137), min(link_alias_142._field_165), min(link_alias_133._field_72), min(t3._field_145), min(link_alias_148._field_156), replace(min(t3._field_140), "\r","^M"),t3.t3_id from t3 left join t4 on t4.seq_0_id = t3.t3_id left join t7 link_alias_142 on t4.seq_1_id = link_alias_142.t7_id left join t6 on t6.seq_0_id = t3.t3_id left join t1 link_alias_133 on t6.seq_1_id = link_alias_133.t1_id left join t2 on t2.seq_0_id = t3.t3_id left join t5 link_alias_148 on t2.seq_1_id = link_alias_148.t5_id where t3.t3_id in (1) group by t3.t3_id order by link_alias_142._field_166, _field_139, link_alias_133._field_72, _field_135, link_alias_148._field_156;
 
 drop table t1,t2,t3,t4,t5,t6,t7;