Fixed compiler warnings

Fixed failing myisam.test and rpl_rotate_logs.test on some configurations


mysql-test/r/myisam.result:
  Portability fix
mysql-test/r/rpl_rotate_logs.result:
  Portability fix
mysql-test/t/myisam.test:
  Depending on if you compiled with -DHAVE_RAID or not, you could get different errors for this test
mysql-test/t/rpl_rotate_logs.test:
  Portability fix
sql/ha_innodb.cc:
  Fixed compiler warnings

5 files changed, 12 insertions, 9 deletions

diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 01aca27d4fc..256bc1e3745 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -1156,9 +1156,9 @@ Warnings:
 Error	2	Can't find file: 't1' (errno: 2)
 create table t1 (a int) engine=myisam;
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+Got one of the listed errors
 create table t1 (a int) engine=myisam;
 drop table t1;
-ERROR HY000: File './test/t1.MYD' not found (Errcode: 2)
+Got one of the listed errors
 drop table t1;
 ERROR 42S02: Unknown table 't1'
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index 2a73eea7517..745d4d8138e 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -100,7 +100,7 @@ commit;
 drop table t1;
 show binlog events in 'master-bin.000001';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	96	Server ver: 5.0.3-alpha-debug-log, Binlog ver: 4
+master-bin.000001	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
 master-bin.000001	96	Query	1	197	use `test`; create table t1 (n int) engine=innodb
 master-bin.000001	197	Query	1	266	use `test`; BEGIN
 master-bin.000001	266	Query	1	94	use `test`; insert into t1 values(100 + 4)
@@ -207,5 +207,5 @@ master-bin.000001	9558	Xid	1	9319	COMMIT /* xid=146 */
 master-bin.000001	9585	Rotate	1	9629	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	4	Format_desc	1	96	Server ver: 5.0.3-alpha-debug-log, Binlog ver: 4
+master-bin.000002	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
 master-bin.000002	96	Query	1	173	use `test`; drop table t1
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 05e80597fab..f919bfced77 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -548,11 +548,11 @@ system rm ./var/master-data/test/t1.MYI ;
 drop table if exists t1;
 create table t1 (a int) engine=myisam;
 system rm ./var/master-data/test/t1.MYI ;
---error 1051
+--error 1051,6
 drop table t1;
 create table t1 (a int) engine=myisam;
 system rm ./var/master-data/test/t1.MYD ;
---error 1105
+--error 1105,6
 drop table t1;
 --error 1051
 drop table t1;
diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test
index 1029c64867a..850d3c1741c 100644
--- a/mysql-test/t/rpl_rotate_logs.test
+++ b/mysql-test/t/rpl_rotate_logs.test
@@ -174,6 +174,9 @@ while ($1)
 --enable_query_log
 commit;
 drop table t1;
+let $VERSION=`select version()`;
+--replace_result $VERSION VERSION
 show binlog events in 'master-bin.000001';
+--replace_result $VERSION VERSION
 show binlog events in 'master-bin.000002';
 
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index d6e17b3b5e2..d2607616a55 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -1698,7 +1698,7 @@ innobase_rollback_to_savepoint(
 	innobase_release_stat_resources(trx);
 
         /* TODO: use provided savepoint data area to store savepoint data */
-        char name[16]; sprintf(name, "s_%08lx", savepoint);
+        char name[16]; sprintf(name, "s_%08lx", (ulong) savepoint);
         error = trx_rollback_to_savepoint_for_mysql(trx, name,
 						&mysql_binlog_cache_pos);
 	DBUG_RETURN(convert_error_code_to_mysql(error, NULL));
@@ -1724,7 +1724,7 @@ innobase_release_savepoint(
 	trx = check_trx_exists(thd);
 
         /* TODO: use provided savepoint data area to store savepoint data */
-        char name[16]; sprintf(name, "s_%08lx", savepoint);
+        char name[16]; sprintf(name, "s_%08lx", (ulong) savepoint);
 	error = trx_release_savepoint_for_mysql(trx, name);
 
 	DBUG_RETURN(convert_error_code_to_mysql(error, NULL));
@@ -1763,7 +1763,7 @@ innobase_savepoint(
         DBUG_ASSERT(trx->active_trans);
 
         /* TODO: use provided savepoint data area to store savepoint data */
-        char name[16]; sprintf(name, "s_%08lx", savepoint);
+        char name[16]; sprintf(name, "s_%08lx", (ulong) savepoint);
         error = trx_savepoint_for_mysql(trx, name, (ib_longlong)0);
 
 	DBUG_RETURN(convert_error_code_to_mysql(error, NULL));