diff options
| -rw-r--r-- | mysql-test/r/derived.result | 2 | ||||
| -rw-r--r-- | mysys/raid.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index d38601c331f..170c393524b 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -254,7 +254,7 @@ CREATE TABLE `t1` ( `M` tinyint(1) default '0', ) TYPE=MyISAM DEFAULT CHARSET=latin1; Warnings: -Warning 1286 'TYPE=database_engine' is deprecated. Use 'ENGINE=database_engine' instead. +Warning 1286 'TYPE=storage_engine' is deprecated. Use 'ENGINE=storage_engine' instead. INSERT INTO `t1` (N, M) VALUES (1, 0),(1, 0),(1, 0),(2, 0),(2, 0),(3, 0); UPDATE `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N SET P1.M = 2; select * from t1; diff --git a/mysys/raid.cc b/mysys/raid.cc index 7eb19ffb16a..0b688464fb3 100644 --- a/mysys/raid.cc +++ b/mysys/raid.cc @@ -70,8 +70,6 @@ tonu@mysql.com & monty@mysql.com */ -#if defined(USE_RAID) && !defined(MYSQL_CLIENT) - #ifdef __GNUC__ #pragma implementation // gcc: Class implementation #endif @@ -81,6 +79,8 @@ #include <m_string.h> #include <assert.h> +#if defined(USE_RAID) && !defined(MYSQL_CLIENT) + #define RAID_SEEK_DONE ~(off_t) 0 #define RAID_SIZE_UNKNOWN ~(my_off_t) 0 |