~ubuntu-branches/ubuntu/natty/mysql-5.1/natty

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/Makefile.in

Tags: 5.1.54-1ubuntu1
* Synchronize from Debian Experimental:
* Merge from debian unstable:
  + debian/control:
     * Update maintainer according to spec.
     * Move section from "misc" to "database".
     * Added libmysqlclient16-dev an empty transitional package. 
     * Added mysql-client-core-5.1 package.
     * Suggest mailx for mysql-server-5.1
     * Add mysql-testsuite package so you can run the testsuite seperately.
  + debian/additions/my.cnf:
    * Remove language options. Error message files are located in a different directory in Mysql
      5.0. Setting the language option to use /usr/share/mysql/english breaks Mysql 5.0. Both 5.0
      and 5.1 use a different value that works. (LP: #316974)
  + Add apparmor profile:
    + debian/apparmor-profile: apparmor-profile
    + debian/rules, debian/mysql-server-5.1.files: install apparmor profile
    + debian/mysql-server-5.1.dirs: add etc/apparmor.d/fore-complain
    + debian/mysql-server-5.1.postrm: remove symlink in force-complain/ on purge.
    + debian/mysql-server-5.1.README.Debian: add apparmor documentation.
    + debian/additions/my.cnf: Add warning about apparmor. (LP: #201799)
    + debian/mysql-server-5.1.postinst: reload apparmor profiles
  * Convert the package from sysvinit to upstart:
    + debian/mysql-server-5.1.mysql.upstart: Add upstart script.
    + debian/mysql-server-5.1.mysql.init: Dropped, unused now with upstart.
    + debian/additions/mysqld_safe_syslog.cnf: Dropped, unused now with upstart.
    + debian/additons/my.cnf: Remove pid declaration and setup error logging to /var/log/mysql since
      we're not piping anything around logger anymore.
    + debian/rules, debian/mysql-server-5.1.logcheck.ignore.{paranoid,worstation},
      debian/mysql-server-5.1.logcheck.ignore.server: : Remove references to mysqld_safe
    + debian/patches/38_scripts_mysqld_safe.sh_signals.dpatch: Dropped
  * Added -fno-strict-aliasing to CFLAGS to get around mysql testsuite build failures.
  * Add Apport hook (LP: #354188):
    + debian/mysql-server-5.1.py: apport package hook
    + debian/rules: Make it installable
  * debian/mysql-server-5.1.mysql-server.logrotate: Check to see if mysql is running before
    running logrotate. (LP: #513135)
  * Make the testsuite installable. (LP: #530752)
    + debian/mysql-server-5.1.files, debian/rules: install apport package hook
  * debian/mysql-server-5.1.preinst: Set mysql user's home directory
    to /nonexistent to protect against having the /var/lib/mysql
    user-writeable. If an attacker can trick mysqld into creating
    dot files in the home directory, he could do .rhost-like attacks
    on the system. (LP: #293258)
  * debian/control: mysql-client-5.1 should depend on mysql-core-client-5.1.
    (LP: #590952)
  * debian/mysql-server.5.1.postinst: Specify the mysql user when installing 
    the mysql databases. (LP: #591875)
  * Installing mysql_config_pic in /usr/bin so users of libmysqld-pic
    can extract the appropriate compile flags. (LP: #605021) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
56
56
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
57
57
        $(srcdir)/Makefile.in COPYING ChangeLog
58
58
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
59
 
am__aclocal_m4_deps = $(top_srcdir)/config/ac-macros/alloca.m4 \
 
59
am__aclocal_m4_deps = $(top_srcdir)/config/ac-macros/maintainer.m4 \
 
60
        $(top_srcdir)/config/ac-macros/alloca.m4 \
60
61
        $(top_srcdir)/config/ac-macros/check_cpu.m4 \
61
62
        $(top_srcdir)/config/ac-macros/character_sets.m4 \
62
63
        $(top_srcdir)/config/ac-macros/compiler_flag.m4 \
275
276
ACLOCAL = @ACLOCAL@
276
277
ALLOCA = @ALLOCA@
277
278
AMTAR = @AMTAR@
 
279
AM_CFLAGS = @AM_CFLAGS@
 
280
AM_CXXFLAGS = @AM_CXXFLAGS@
278
281
AR = @AR@
279
282
ARFLAGS = @ARFLAGS@
280
283
AS = @AS@
526
529
plugin_ftexample_static_target = @plugin_ftexample_static_target@
527
530
plugin_heap_shared_target = @plugin_heap_shared_target@
528
531
plugin_heap_static_target = @plugin_heap_static_target@
529
 
plugin_ibmdb2i_shared_target = @plugin_ibmdb2i_shared_target@
530
 
plugin_ibmdb2i_static_target = @plugin_ibmdb2i_static_target@
531
532
plugin_innobase_shared_target = @plugin_innobase_shared_target@
532
533
plugin_innobase_static_target = @plugin_innobase_static_target@
533
534
plugin_innodb_plugin_shared_target = @plugin_innodb_plugin_shared_target@
543
544
prefix = @prefix@
544
545
program_transform_name = @program_transform_name@
545
546
psdir = @psdir@
546
 
pstack_dir = @pstack_dir@
547
 
pstack_libs = @pstack_libs@
548
547
readline_basedir = @readline_basedir@
549
548
readline_dir = @readline_dir@
550
549
readline_h_ln_cmd = @readline_h_ln_cmd@
882
881
                        ut/ut0vec.c                     \
883
882
                        ut/ut0wqueue.c
884
883
 
885
 
libinnobase_a_CXXFLAGS = $(AM_CFLAGS)
 
884
libinnobase_a_CXXFLAGS = $(AM_CXXFLAGS)
886
885
libinnobase_a_CFLAGS = $(AM_CFLAGS)
887
886
EXTRA_LTLIBRARIES = ha_innodb_plugin.la
888
887
pkgplugin_LTLIBRARIES = @plugin_innodb_plugin_shared_target@
889
888
ha_innodb_plugin_la_LDFLAGS = -module -rpath $(pkgplugindir)
890
 
ha_innodb_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 
889
ha_innodb_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
891
890
ha_innodb_plugin_la_CFLAGS = $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
892
891
ha_innodb_plugin_la_SOURCES = $(libinnobase_a_SOURCES)
893
892
EXTRA_DIST = CMakeLists.txt plug.in \