Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~akopytov/percona-server/bug1064953-5.1 into lp:percona-server/5.1

  1. bug1064953-5.1
  2. Merge into 5.1
Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 492
Proposed branch: lp:~akopytov/percona-server/bug1064953-5.1
Merge into: lp:percona-server/5.1
Diff against target: 31 lines (+9/-0)
2 files modified
Percona-Server/configure.in (+3/-0)
Percona-Server/sql/Makefile.am (+6/-0)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug1064953-5.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+128912@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Approving myself, as I would really like to have this in the next release (so I could rebase Percona XtraBackup on it to be able to build it locally).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/configure.in'
2--- Percona-Server/configure.in 2012-08-20 03:14:02 +0000
3+++ Percona-Server/configure.in 2012-10-10 11:36:22 +0000
4@@ -2934,6 +2934,9 @@
5 # Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS
6 AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'")
7
8+# Automake 1.12 generates sql_yacc.hh instead of sql_yacc.h
9+AM_CONDITIONAL(HAVE_AM_YACC_C2H, grep -q am__yacc_c2h $srcdir/sql/Makefile.in)
10+
11 AC_OUTPUT
12
13 # Add warning if user configures with --with-ndbcluster
14
15=== modified file 'Percona-Server/sql/Makefile.am'
16--- Percona-Server/sql/Makefile.am 2012-08-20 03:14:02 +0000
17+++ Percona-Server/sql/Makefile.am 2012-10-10 11:36:22 +0000
18@@ -146,7 +146,13 @@
19 -DHAVE_EVENT_SCHEDULER \
20 @DEFS@
21
22+# Automake 1.12 generates sql_yacc.hh instead of sql_yacc.h
23 BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.h
24+if HAVE_AM_YACC_C2H
25+sql_yacc.h:
26+ @LN_CP_F@ sql_yacc.hh sql_yacc.h
27+endif
28+
29 BUILT_SOURCES = $(BUILT_MAINT_SRC) lex_hash.h patch_info.h link_sources
30 EXTRA_DIST = udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
31 nt_servc.cc nt_servc.h \

Subscribers

People subscribed via source and target branches