2009-02-17 11:30:55 +01:00
|
|
|
#
|
2010-03-26 15:19:01 +01:00
|
|
|
# Copyright (c) 2006, 2010, Innobase Oy. All Rights Reserved.
|
2009-02-17 11:30:55 +01:00
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or modify it under
|
|
|
|
# the terms of the GNU General Public License as published by the Free Software
|
|
|
|
# Foundation; version 2 of the License.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
|
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License along with
|
|
|
|
# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
|
|
|
# Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
#
|
|
|
|
|
2010-04-07 20:33:36 +02:00
|
|
|
MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine],
|
2006-09-04 21:47:47 +02:00
|
|
|
[Transactional Tables using InnoDB], [max,max-no-ndb])
|
2010-04-07 20:33:36 +02:00
|
|
|
MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin])
|
|
|
|
MYSQL_PLUGIN_DYNAMIC(innodb_plugin, [ha_innodb_plugin.la])
|
|
|
|
MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
|
2007-10-15 13:30:38 +02:00
|
|
|
AC_CHECK_HEADERS(sched.h)
|
2006-09-04 21:47:47 +02:00
|
|
|
AC_CHECK_SIZEOF(int, 4)
|
|
|
|
AC_CHECK_SIZEOF(long, 4)
|
|
|
|
AC_CHECK_SIZEOF(void*, 4)
|
2007-10-15 13:30:38 +02:00
|
|
|
AC_CHECK_FUNCS(sched_yield fdatasync localtime_r)
|
2006-09-04 21:47:47 +02:00
|
|
|
AC_C_BIGENDIAN
|
|
|
|
case "$target_os" in
|
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
------------------------------------------------------------------------
2008-04-30 18:59:16 +02:00
|
|
|
lin*)
|
2009-02-27 01:13:19 +01:00
|
|
|
CFLAGS="$CFLAGS -DUNIV_LINUX";;
|
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
------------------------------------------------------------------------
2008-04-30 18:59:16 +02:00
|
|
|
hpux10*)
|
2009-02-27 01:13:19 +01:00
|
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";;
|
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
------------------------------------------------------------------------
2008-04-30 18:59:16 +02:00
|
|
|
hp*)
|
2009-02-27 01:13:19 +01:00
|
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";;
|
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
------------------------------------------------------------------------
2008-04-30 18:59:16 +02:00
|
|
|
aix*)
|
2009-02-27 01:13:19 +01:00
|
|
|
CFLAGS="$CFLAGS -DUNIV_AIX";;
|
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
------------------------------------------------------------------------
2008-04-30 18:59:16 +02:00
|
|
|
irix*|osf*|sysv5uw7*|openbsd*)
|
2009-02-27 01:13:19 +01:00
|
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
|
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
------------------------------------------------------------------------
2008-04-30 18:59:16 +02:00
|
|
|
*solaris*|*SunOS*)
|
2009-02-27 01:13:19 +01:00
|
|
|
CFLAGS="$CFLAGS -DUNIV_SOLARIS";;
|
2006-09-04 21:47:47 +02:00
|
|
|
esac
|
2009-09-12 08:26:03 +02:00
|
|
|
|
2008-02-12 23:05:01 +01:00
|
|
|
INNODB_DYNAMIC_CFLAGS="-DMYSQL_DYNAMIC_PLUGIN"
|
2009-09-12 08:26:03 +02:00
|
|
|
|
2008-02-12 23:05:01 +01:00
|
|
|
case "$target_cpu" in
|
|
|
|
x86_64)
|
|
|
|
# The AMD64 ABI forbids absolute addresses in shared libraries
|
|
|
|
;;
|
|
|
|
*86)
|
|
|
|
# Use absolute addresses on IA-32
|
|
|
|
INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(INNODB_DYNAMIC_CFLAGS)
|
2009-08-31 08:47:49 +02:00
|
|
|
|
|
|
|
AC_MSG_CHECKING(whether GCC atomic builtins are available)
|
2009-09-12 08:26:03 +02:00
|
|
|
# either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
|
2009-08-31 08:47:49 +02:00
|
|
|
AC_TRY_RUN(
|
|
|
|
[
|
|
|
|
int main()
|
|
|
|
{
|
|
|
|
long x;
|
|
|
|
long y;
|
|
|
|
long res;
|
|
|
|
char c;
|
|
|
|
|
|
|
|
x = 10;
|
|
|
|
y = 123;
|
|
|
|
res = __sync_bool_compare_and_swap(&x, x, y);
|
|
|
|
if (!res || x != y) {
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
x = 10;
|
|
|
|
y = 123;
|
|
|
|
res = __sync_bool_compare_and_swap(&x, x + 1, y);
|
|
|
|
if (res || x != 10) {
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
x = 10;
|
|
|
|
y = 123;
|
|
|
|
res = __sync_add_and_fetch(&x, y);
|
|
|
|
if (res != 123 + 10 || x != 123 + 10) {
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
c = 10;
|
|
|
|
res = __sync_lock_test_and_set(&c, 123);
|
|
|
|
if (res != 10 || c != 123) {
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
|
|
|
|
[GCC atomic builtins are available])
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
]
|
2009-09-11 18:46:47 +02:00
|
|
|
)
|
2009-08-31 08:47:49 +02:00
|
|
|
|
2009-03-05 15:38:59 +01:00
|
|
|
AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
|
2009-09-12 09:33:11 +02:00
|
|
|
# either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
|
2009-03-05 15:38:59 +01:00
|
|
|
AC_TRY_RUN(
|
|
|
|
[
|
|
|
|
#include <pthread.h>
|
2009-04-17 23:31:34 +02:00
|
|
|
#include <string.h>
|
2009-03-05 15:38:59 +01:00
|
|
|
|
|
|
|
int main(int argc, char** argv) {
|
|
|
|
pthread_t x1;
|
|
|
|
pthread_t x2;
|
|
|
|
pthread_t x3;
|
|
|
|
|
2009-04-17 23:31:34 +02:00
|
|
|
memset(&x1, 0x0, sizeof(x1));
|
|
|
|
memset(&x2, 0x0, sizeof(x2));
|
|
|
|
memset(&x3, 0x0, sizeof(x3));
|
|
|
|
|
2009-03-05 15:38:59 +01:00
|
|
|
__sync_bool_compare_and_swap(&x1, x2, x3);
|
|
|
|
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
],
|
|
|
|
[
|
2009-09-12 09:33:11 +02:00
|
|
|
AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
|
2009-03-05 15:38:59 +01:00
|
|
|
[pthread_t can be used by GCC atomic builtins])
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
]
|
2009-09-11 18:46:47 +02:00
|
|
|
)
|
2009-04-07 16:45:37 +02:00
|
|
|
|
2009-09-12 08:26:03 +02:00
|
|
|
AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
|
2009-09-12 10:25:44 +02:00
|
|
|
# either define HAVE_IB_SOLARIS_ATOMICS or not
|
2009-09-12 08:26:03 +02:00
|
|
|
AC_CHECK_FUNCS(atomic_add_long \
|
|
|
|
atomic_cas_32 \
|
|
|
|
atomic_cas_64 \
|
|
|
|
atomic_cas_ulong,
|
|
|
|
|
2009-09-12 10:25:44 +02:00
|
|
|
AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
|
2009-09-12 08:26:03 +02:00
|
|
|
[Define to 1 if Solaris libc atomic functions \
|
|
|
|
are available])
|
|
|
|
)
|
|
|
|
|
|
|
|
AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
|
2009-09-12 09:33:11 +02:00
|
|
|
# either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
|
2009-09-12 08:26:03 +02:00
|
|
|
AC_TRY_RUN(
|
2009-04-07 16:45:37 +02:00
|
|
|
[
|
2009-09-12 08:26:03 +02:00
|
|
|
#include <pthread.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
int main(int argc, char** argv) {
|
|
|
|
pthread_t x1;
|
|
|
|
pthread_t x2;
|
|
|
|
pthread_t x3;
|
|
|
|
|
|
|
|
memset(&x1, 0x0, sizeof(x1));
|
|
|
|
memset(&x2, 0x0, sizeof(x2));
|
|
|
|
memset(&x3, 0x0, sizeof(x3));
|
|
|
|
|
|
|
|
if (sizeof(pthread_t) == 4) {
|
|
|
|
|
|
|
|
atomic_cas_32(&x1, x2, x3);
|
|
|
|
|
|
|
|
} else if (sizeof(pthread_t) == 8) {
|
|
|
|
|
|
|
|
atomic_cas_64(&x1, x2, x3);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
return(1);
|
|
|
|
}
|
2009-09-14 10:17:18 +02:00
|
|
|
|
|
|
|
return(0);
|
2009-09-14 09:38:45 +02:00
|
|
|
}
|
2009-04-07 16:45:37 +02:00
|
|
|
],
|
|
|
|
[
|
2009-09-12 09:33:11 +02:00
|
|
|
AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1],
|
2009-04-07 16:45:37 +02:00
|
|
|
[pthread_t can be used by solaris atomics])
|
2009-09-12 08:26:03 +02:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
# this is needed to know which one of atomic_cas_32() or atomic_cas_64()
|
|
|
|
# to use in the source
|
|
|
|
AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
|
|
|
|
|
2009-07-02 14:12:36 +02:00
|
|
|
# Check for x86 PAUSE instruction
|
2009-07-06 18:16:32 +02:00
|
|
|
AC_MSG_CHECKING(for x86 PAUSE instruction)
|
2009-07-02 14:12:36 +02:00
|
|
|
# We have to actually try running the test program, because of a bug
|
|
|
|
# in Solaris on x86_64, where it wrongly reports that PAUSE is not
|
|
|
|
# supported when trying to run an application. See
|
|
|
|
# http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684
|
|
|
|
# We use ib_ prefix to avoid collisoins if this code is added to
|
|
|
|
# mysql's configure.in.
|
2009-07-06 18:16:32 +02:00
|
|
|
AC_TRY_RUN(
|
|
|
|
[
|
2009-07-02 14:12:36 +02:00
|
|
|
int main() {
|
|
|
|
__asm__ __volatile__ ("pause");
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
],
|
2009-07-06 18:16:32 +02:00
|
|
|
[
|
2009-09-12 10:25:44 +02:00
|
|
|
AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist])
|
2009-07-06 18:16:32 +02:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
],
|
|
|
|
[
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
]
|
2009-07-02 14:12:36 +02:00
|
|
|
)
|
2006-09-04 21:47:47 +02:00
|
|
|
])
|
|
|
|
|
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
------------------------------------------------------------------------
2008-04-30 18:59:16 +02:00
|
|
|
# vim: set ft=config:
|