diff options
| author | Michael Widenius <monty@mysql.com> | 2009-11-11 13:17:49 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-11-11 13:17:49 +0200 |
| commit | edd792fe12c2872139ead04bb1e210320599e9b7 (patch) | |
| tree | 41eb09b98399023f76282210844ac6844091e7b5 /unittest | |
| parent | 166e0683c0d45a79716d8913ec9ecaf3177343fa (diff) | |
| parent | a95f54c6d81f20b07e41a7e0e2246ee00641df6c (diff) | |
| download | mariadb-git-edd792fe12c2872139ead04bb1e210320599e9b7.tar.gz | |
Merge with MySQL 5.1, with following additions:
- Moved some code from innodb_plugin to xtradb, to ensure that all tests runs
- Did changes in pbxt and maria storage engines becasue of changes in thd->query
- Reverted wrong code in sql_table.cc for how ROW_FORMAT is used.
Todo before joining with main 5.1 tree:
- Join test fails (Igor to investigate)
- mysql-test-run shows warnings from tests; Some suppression rule is not working (Kristian to investiage)
- Run through all buildbots
sql/sql_table.cc:
Reverted code for ROW_FORMAT is used. We must set the HA_CREATE_USED_ROW_FORMAT flag in alter table
to signal the handler that it should not change row_type in update_create_info() (as happens for SHOW CREATE).
storage/maria/ha_maria.cc:
Update for change in defintion of thd->query
storage/myisam/mi_check.c:
Simplify code
storage/pbxt/src/discover_xt.cc:
Update for change in defintion of thd->query
storage/xtradb/dict/dict0dict.c:
Update for change in defintion of thd->query
storage/xtradb/handler/ha_innodb.cc:
Copy some critical changes from innodb_plugin to get tests to pass
storage/xtradb/handler/ha_innodb.h:
Copy some critical changes from innodb_plugin to get tests to pass
storage/xtradb/handler/handler0alter.cc:
Copy some critical changes from innodb_plugin to get tests to pass
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/mysys/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/unittest/mysys/Makefile.am b/unittest/mysys/Makefile.am index ab997c79b33..5ceae438aa2 100644 --- a/unittest/mysys/Makefile.am +++ b/unittest/mysys/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (C) 2009 Sun Microsystems, Inc. # # 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 @@ -26,6 +26,14 @@ LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ $(top_builddir)/strings/libmystrings.a EXTRA_DIST = CMakeLists.txt +noinst_PROGRAMS = bitmap-t base64-t + +if NEED_THREAD +# my_atomic-t is used to check thread functions, so it is safe to +# ignore the file in non-threaded builds. +# In fact, it will not compile without thread support. +noinst_PROGRAMS += my_atomic-t +endif # Don't update the files from bitkeeper %::SCCS/s.% |