← Back to branch summary

~ourdelta-core/ourdelta/trunk015fmt

« back to all changes in this revision

Viewing changes to mysql/5.0/proven_scaling/show_patches/show_patches.patch

Merge from percona d6 (MySQL 5.0) branch.
microslow backward compatibility fixups

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql/5.0/proven_scaling/show_patches/show_patches.patch
31
31
 
32
32
 # Don't update the files from bitkeeper
33
33
 %::SCCS/s.%
34
 
Index: mysql-5.0.67/sql/Makefile.in
35
 
===================================================================
36
 
--- mysql-5.0.67.orig/sql/Makefile.in
37
 
+++ mysql-5.0.67/sql/Makefile.in
38
 
@@ -559,7 +559,7 @@ gen_lex_hash_SOURCES = gen_lex_hash.cc
39
 
 gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
40
 
 mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql.cc
41
 
 mysql_tzinfo_to_sql_LDADD = @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS)
42
 
-BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h
43
 
+BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h patch_info.h
44
 
 EXTRA_DIST = $(BUILT_SOURCES) nt_servc.cc nt_servc.h \
45
 
                        message.mc examples/CMakeLists.txt CMakeLists.txt \
46
 
                        udf_example.c udf_example.def
47
 
@@ -1234,6 +1234,9 @@ lex_hash.h:       gen_lex_hash.cc lex.h
48
 
                ./gen_lex_hash$(EXEEXT) > $@-t
49
 
                $(MV) $@-t $@
50
 
 
51
 
+patch_info.h: patch_info.h.pl
52
 
+       $(PERL) $< > $@
53
 
+
54
 
 # Don't update the files from bitkeeper
55
 
 %::SCCS/s.%
56
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
57
34
Index: mysql-5.0.67/sql/lex.h
58
35
===================================================================
59
36
--- mysql-5.0.67.orig/sql/lex.h