Skip to content

M
mariadb
Commit 624ed50e authored by Luis Soares's avatar Luis Soares
Browse files
Options

BUG#12695969 

Manually merged from mysql-5.0 into mysql-5.1.

conflicts
=========

include/Makefile.am
parents e018925a b9dd956a
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
include/Makefile.am
View file @ 624ed50e
...@@ -38,7 +38,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \ ...@@ -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 \ 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 \ 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_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 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7