Commit 97552787 authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777

into  neptunus.(none):/home/msvensson/mysql/bug10777/my51-bug10777


sql/Makefile.am:
  SCCS merged
parents dba4554f 08edaf92
...@@ -153,7 +153,8 @@ mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES) ...@@ -153,7 +153,8 @@ mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES)
# flags, so can't pregenerate and include in source TAR. Revert to # flags, so can't pregenerate and include in source TAR. Revert to
# dist pregenerated if this changes, so the file doesn't differ. # dist pregenerated if this changes, so the file doesn't differ.
lex_hash.h: gen_lex_hash$(EXEEXT) lex_hash.h: gen_lex_hash$(EXEEXT)
./gen_lex_hash$(EXEEXT) > $@ ./gen_lex_hash$(EXEEXT) > $@-t
$(MV) $@-t $@
# the following three should eventually be moved out of this directory # the following three should eventually be moved out of this directory
ha_ndbcluster.o:ha_ndbcluster.cc ha_ndbcluster.h ha_ndbcluster.o:ha_ndbcluster.cc ha_ndbcluster.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment