diff options
| author | Sven Sandberg <sven@mysql.com> | 2008-08-04 07:04:47 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven@mysql.com> | 2008-08-04 07:04:47 +0200 |
| commit | 73e253370b22e226a68c119fe41b18cd94fd1170 (patch) | |
| tree | c4c5392cc5a65fb4236f8e309a373a02b05f0ef3 /configure.in | |
| parent | b467c15e3694772b0da0930274a8dfc4a8ead030 (diff) | |
| parent | b1252a7ccf6af29a26f5c341a6ad6d1baaf965a2 (diff) | |
| download | mariadb-git-73e253370b22e226a68c119fe41b18cd94fd1170.tar.gz | |
merged 5.1 main to 5.1-rpl
manually resolved conflicts:
Text conflict in client/mysqltest.c
Contents conflict in mysql-test/include/have_bug25714.inc
Text conflict in mysql-test/include/have_ndbapi_examples.inc
Text conflict in mysql-test/mysql-test-run.pl
Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result
Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def
Text conflict in mysql-test/t/disabled.def
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 56bdb4ba006..4ab7f1ccc1b 100644 --- a/configure.in +++ b/configure.in @@ -2789,8 +2789,8 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl server-tools/Makefile server-tools/instance-manager/Makefile dnl cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile dnl libmysqld/Makefile libmysqld/examples/Makefile dnl - mysql-test/Makefile dnl - mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile dnl + mysql-test/Makefile mysql-test/lib/My/SafeProcess/Makefile dnl + netware/Makefile sql-bench/Makefile dnl include/mysql_version.h plugin/Makefile win/Makefile) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) |