mariadb

Tree: d609478ae1

Author	SHA1	Message	Date
vasil	0260a98c32	branches/zip: Merge 2423:2437 from branches/5.1: ------------------------------------------------------------------------ r2429 \| vasil \| 2008-04-30 11:19:06 +0300 (Wed, 30 Apr 2008) \| 10 lines branches/5.1: * Use INNODB_CFLAGS insead of cluttering CFLAGS with InnoDB specific flags. CFLAGS are used to compile every file in the MySQL source tree. * Add INNODB_DYNAMIC_CFLAGS to the flags of the dynamic plugin and use -prefer-non-pic to make the dynamic plugin faster on i386. Approved by: Sunny ------------------------------------------------------------------------ r2430 \| vasil \| 2008-04-30 11:48:35 +0300 (Wed, 30 Apr 2008) \| 8 lines branches/5.1: Use CFLAGS instead of INNODB_CFLAGS to avoid having incompatible flags inserted in CFLAGS and INNODB_CFLAGS and to avoid compiling mysql and innodb with different flags. Discussed with: Sunny ------------------------------------------------------------------------ r2431 \| vasil \| 2008-04-30 11:54:49 +0300 (Wed, 30 Apr 2008) \| 4 lines branches/5.1: Fix r2430, it should be CFLAGS="$CFLAGS ..." not CFLAGS="..." ------------------------------------------------------------------------ r2432 \| vasil \| 2008-04-30 11:58:38 +0300 (Wed, 30 Apr 2008) \| 4 lines branches/5.1: Non-functional change: use tabs for indentation in plug.in. ------------------------------------------------------------------------ r2433 \| vasil \| 2008-04-30 12:02:35 +0300 (Wed, 30 Apr 2008) \| 5 lines branches/5.1: Add vim modeline to hint it that plug.in is a config file so it can be colorized. ------------------------------------------------------------------------ r2434 \| vasil \| 2008-04-30 18:45:44 +0300 (Wed, 30 Apr 2008) \| 17 lines branches/5.1: Merge changes from MySQL: ChangeSet@1.2645, 2007-12-19 13:24:43+00:00, jperkin@chorlton.adsl.perkin.org.uk +14 -0 Add new pkgplugindir handling to seperate plugins from libraries, and allow override for binary distributions. Extend mysql_config to print compiled-in plugin location for third-party plugins to use. Resolves bug#31736. and ChangeSet@1.2646, 2008-01-02 13:00:46+00:00, jperkin@chorlton.adsl.perkin.org.uk +11 -0 Use pkglibdir to simplify pkgplugindir, and fix the path in a couple of Makefiles. Continuation of the fix for bug#31736. ------------------------------------------------------------------------ r2435 \| vasil \| 2008-04-30 19:04:36 +0300 (Wed, 30 Apr 2008) \| 10 lines branches/5.1: Merge change from MySQL: ChangeSet@1.2563, 2008-03-18 19:42:04+04:00, gluh@mysql.com +1 -0 Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTS added intialization of f_key_info.referenced_key_name for the case when referenced table is dropped ------------------------------------------------------------------------ r2436 \| vasil \| 2008-04-30 19:15:46 +0300 (Wed, 30 Apr 2008) \| 7 lines branches/5.1: Non-functional white space change in Makefile.am: Use tabs for indentation and be consistent about spaces around the equal sign. ------------------------------------------------------------------------ r2437 \| vasil \| 2008-04-30 20:36:11 +0300 (Wed, 30 Apr 2008) \| 8 lines branches/5.1: Fix Bug#36434 ha_innodb.so is installed in the wrong directory Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been forgotten in this commit: http://lists.mysql.com/commits/40206 ------------------------------------------------------------------------	18 years ago
marko	9194c3a9e6	branches/zip: Pass -prefer-non-pic only on IA-32 (x86) when building the dynamic InnoDB plugin, ha_innodb.so. This libtool option cannot be used on every target platform. For instance, the AMD64 (x86_64) ABI mandates position-independent code (PIC) in dynamic shared objects. Makefile.am: Use $(INNODB_CFLAGS) and $(INNODB_DYNAMIC_CFLAGS) in target-specific CFLAGS and CXXFLAGS variable definitions. plug.in: Instead of appending to the MySQL-wide CFLAGS, introduce the variables INNODB_CFLAGS and INNODB_DYNAMIC_CFLAGS. Depending on $target_cpu, append -prefer-non-pic to INNODB_DYNAMIC_CFLAGS.	18 years ago
marko	186a5e9d26	branches/zip: plug.in: Remove the check for aio.h and -lrt, which were never used. Combine the three AC_CHECK_FUNCS tests.	18 years ago
marko	140a706079	branches/zip: Merge 1783:1792 from trunk.	18 years ago
marko	0a780db994	branches/zip: Merge 1575:1664 from trunk.	19 years ago
marko	88df83bb3b	branches/zip: Merge revisions 1402:1493 from trunk. Remove mysql.patch, because the configuration parameter interface has changed.	19 years ago
marko	4d6805f2a8	branches/zip: Merge revisions 1322:1402 from trunk.	19 years ago
marko	19420d4621	branches/zip: Merge revisions 968:1009 from trunk.	19 years ago
marko	48dd1ece29	branches/zip: Merge revisions 789:804 from trunk.	19 years ago
marko	d4d321ad85	branches/zip: Merge revisions 767:789 from trunk.	19 years ago

10 Commits (d609478ae192d5daae9dfa4df61a655a3c3ea362)