Commit 5856b836 authored by unknown's avatar unknown
Browse files

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime
parents b63b7ad3 12ed25e7

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -567,8 +567,10 @@ heap/hp_test2 
help

help.c

help.h

include/check_abi

include/my_config.h

include/my_global.h

include/mysql_h.ic

include/mysql_version.h

include/mysqld_ername.h

include/mysqld_error.h
@@ -1260,6 +1262,7 @@ mysql-test/r/bdb-deadlock.err 
mysql-test/r/bdb.err

mysql-test/r/bdb.log

mysql-test/r/bdb_cache.err

mysql-test/r/blackhole.log

mysql-test/r/client_test.err

mysql-test/r/csv.err

mysql-test/r/ctype_ucs.err

BitKeeper/etc/collapsed

+8 −0
Original line number Diff line number Diff line
@@ -5,5 +5,13 @@ 
45001f7c3b2hhCXDKfUvzkX9TNe6VA

45002051rHJfMEXAIMiAZV0clxvKSA

4513d8e4Af4dQWuk13sArwofRgFDQw

45143312u0Tz4r0wPXCbUKwdHa2jWA

45143b90ewOQuTW8-jrB3ZSAQvMRJw

45184588w9U72A6KX1hUFeAC4shSHA

45185df8mZbxfp85FbA0VxUXkmDewA

4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

451b110a3ZV6MITl93ehXk2wxrbW7g

45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

BitKeeper/triggers/pre-outgoing.crash-protect.pl

+0 −4
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' || 
  exit 0;

}



print "Checking for bad changesets from old crashed 5.1 tree...\n";



my @bad_csets=

    ( 'monty@mysql.com|ChangeSet|20060418090255|16983',

      'monty@mysql.com|ChangeSet|20060418090458|02628',
@@ -80,6 +78,4 @@ END 
  }

}



print "No bad changesets found, proceeding.\n";



exit 0;

BitKeeper/triggers/pre-resolve.crash-protect.pl

+0 −4
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' || 
  exit 0;

}



print "Checking for bad changesets from old crashed 5.1 tree...\n";



my @bad_csets=

    ( 'monty@mysql.com|ChangeSet|20060418090255|16983',

      'monty@mysql.com|ChangeSet|20060418090458|02628',
@@ -80,6 +78,4 @@ END 
  }

}



print "No bad changesets found, proceeding.\n";



exit 0;

client/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ mysqladmin_SOURCES = mysqladmin.cc 
mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \

				$(yassl_dummy_link_fix)

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD) \

				$(top_builddir)/mysys/libmysys.a

mysqlbinlog_SOURCES =		mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \

				$(top_srcdir)/mysys/my_new.cc \

				$(top_srcdir)/mysys/my_bit.c \