diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-02 19:39:45 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-02 19:39:45 +0300 |
| commit | a74d04671d23fa65bd610184965cc2974ec41cf9 (patch) | |
| tree | ac1577cdd546fe5fd7914a268d6b2728b86b021f /include/my_base.h | |
| parent | 80204e051c1e9acda0ab7a6a50c728795b67adb3 (diff) | |
| download | mariadb-git-a74d04671d23fa65bd610184965cc2974ec41cf9.tar.gz | |
Fixed warnings and build failures after last push
Speed up some PBXT tests by adding begin...commit around creating of testing tables.
include/my_base.h:
Fixed wrong constant
mysql-test/mysql-test-run.pl:
Print MariaDB instead of MySQL
mysql-test/r/range.result:
Move test that required partitions to parts.optimizer
mysql-test/suite/innodb_plugin/t/disabled.def:
Disable test that causes valgrind warning about not released memory in xtradb
mysql-test/suite/parts/r/optimizer.result:
Moved from range.result
mysql-test/suite/parts/t/optimizer.test:
Moved from range.test
mysql-test/suite/pbxt/r/join_nested.result:
Updated results after optimizer changes
mysql-test/suite/pbxt/r/renamedb.result:
Updated test for new error message
mysql-test/suite/pbxt/t/check.test:
Speed up test
mysql-test/suite/pbxt/t/count_distinct2.test:
Speed up test
mysql-test/suite/pbxt/t/derived.test:
Speed up test
mysql-test/suite/pbxt/t/renamedb.test:
Updated test for new error message
mysql-test/suite/rpl/r/rpl_log_pos.result:
Updated results
mysql-test/suite/rpl/t/rpl_log_pos.test:
Update test to read from a position that has 'known wrong' data.
The orignal test read a timestamp, so the error message could differ between runs.
mysql-test/suite/rpl/t/rpl_temporary_errors.test:
Sync to slave to make test predictable
mysql-test/t/events_time_zone.test:
Extend wait to make test predictable
mysql-test/t/range.test:
Move test that required partitions to parts.optimizer
sql/sql_list.h:
Fixed compiler warning
sql/sql_load.cc:
buffer was not freed in some error conditions
tests/mysql_client_test.c:
Fixed compiler warning
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index f76903dcb6b..00a13f28f57 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -272,7 +272,7 @@ enum ha_base_keytype { #define HA_USES_PARSER 16384 /* Fulltext index uses [pre]parser */ #define HA_USES_BLOCK_SIZE ((uint) 32768) #define HA_SORT_ALLOWS_SAME 512 /* Intern bit when sorting records */ -#if MYSQL_VERSION_ID < 0x50200 +#if MYSQL_VERSION_ID < 50200 /* Key has a part that can have end space. If this is an unique key we have to handle it differently from other unique keys as we can find |