Commit 624ed50e authored by Luis Soares's avatar Luis Soares

BUG#12695969

Manually merged from mysql-5.0 into mysql-5.1.

conflicts
=========

include/Makefile.am
parents e018925a b9dd956a
......@@ -38,7 +38,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \
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
......
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