3570 Luis Soares 2011-07-12 [merge]
BUG#12695969
Manually merged from mysql-5.0 into mysql-5.1.
conflicts
=========
include/Makefile.am
modified:
include/Makefile.am
3569 Luis Soares 2011-07-11 [merge]
BUG#12695969
Manually merged mysql-5.0 into mysql-5.1.
conflicts
=========
client/mysqlibinlog.cc
added:
include/welcome_copyright_notice.h
modified:
client/mysqlbinlog.cc
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am 2011-07-03 18:08:47 +0000
+++ b/include/Makefile.am 2011-07-12 01:13:36 +0000
@@ -38,7 +38,7 @@ noinst_HEADERS = config-win.h config-net
my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
my_compare.h my_time.h my_vle.h my_user.h \
- my_libwrap.h my_stacktrace.h
+ my_libwrap.h my_stacktrace.h welcome_copyright_notice.h
EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1 branch (luis.soares:3569 to 3570) Bug#12695969 | Luis Soares | 13 Jul |
