3817 Joerg Bruehe 2010-03-12 [merge]
Merge into 6.0-codebase-bugfixing, conflict easily solved.
modified:
plugin/Makefile.am
3816 Konstantin Osipov 2010-03-11 [merge]
Merge next-mr-bugfixing -> 6.0-codebase-bugfixing.
modified:
sql/sql_prepare.cc
tests/mysql_client_test.c
=== modified file 'plugin/Makefile.am'
--- a/plugin/Makefile.am 2010-03-10 13:31:06 +0000
+++ b/plugin/Makefile.am 2010-03-12 10:08:17 +0000
@@ -27,4 +27,4 @@ DIST_SUBDIRS = @mysql_pg_distdirs@
# As of 5.5.3-m3, we want to include the plugin files of a debug build in the package
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkglibdir)/plugin
- test ! -d debug || $(TAR) cf - debug | ( cd $(DESTDIR)$(pkglibdir) && $(TAR) xvf - )
+ test ! -d debug || $(TAR) cf - debug | ( cd $(DESTDIR)$(pkglibdir)/plugin && $(TAR) xvf - )
Attachment: [text/bzr-bundle] bzr/joerg@mysql.com-20100312100817-ywp2aepldnxesnd6.bundle
| Thread |
|---|
| • bzr push into mysql-6.0-codebase-bugfixing branch (joerg:3816 to 3817) | Joerg Bruehe | 12 Mar 2010 |
