List:Commits« Previous MessageNext Message »
From:Kelly Long Date:September 4 2008 5:29pm
Subject:bzr push into mysql-6.0-falcon branch (klong:2810 to 2811)
View as plain text  
 2811 Kelly Long	2008-09-04
      Quiet a compiler warning
modified:
  storage/falcon/Cache.cpp

 2810 Kelly Long	2008-09-04 [merge]
      Merge changes from others before I can push.
removed:
  include/mysql_h.ic
added:
  include/mysql.h.pp
  include/mysql/plugin.h.pp
  mysql-test/suite/falcon/r/falcon_bug_37668.result
  mysql-test/suite/falcon/t/falcon_bug_37668.test
  sql/mysql_priv.h.pp
  storage/falcon/SyncHandler.cpp
  storage/falcon/SyncHandler.h
modified:
  Makefile.am
  client/mysqldump.c
  configure.in
  include/Makefile.am
  mysql-test/r/information_schema.result
  mysql-test/r/information_schema_db.result
  mysql-test/r/mysqlshow.result
  mysql-test/suite/funcs_1/r/is_columns_is.result
  mysql-test/suite/funcs_1/r/is_columns_is_falcon.result
  mysql-test/suite/funcs_1/r/is_tables_is.result
  mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
  mysql-test/suite/ndb/r/ndb_dd_dump.result
  mysql-test/suite/ndb/t/ndb_dd_dump.test
  mysql-test/suite/parts/t/disabled.def
  sql/backup/kernel.cc
  sql/ha_ndbcluster.cc
  sql/handler.h
  sql/mysql_priv.h
  sql/si_objects.cc
  sql/si_objects.h
  sql/sql_insert.cc
  sql/sql_show.cc
  sql/table.h
  storage/falcon/CMakeLists.txt
  storage/falcon/Database.cpp
  storage/falcon/Database.h
  storage/falcon/InfoTable.cpp
  storage/falcon/InfoTable.h
  storage/falcon/Makefile.am
  storage/falcon/RecoveryObjects.cpp
  storage/falcon/SerialLog.cpp
  storage/falcon/SerialLog.h
  storage/falcon/Statement.cpp
  storage/falcon/StorageHandler.cpp
  storage/falcon/StorageTableShare.cpp
  storage/falcon/SyncObject.cpp
  storage/falcon/SyncObject.h
  storage/falcon/Table.cpp
  storage/falcon/TableSpaceManager.cpp
  storage/falcon/Transaction.cpp
  storage/falcon/Transaction.h
  storage/falcon/ha_falcon.cpp
  storage/falcon/ha_falcon.h

=== modified file 'storage/falcon/Cache.cpp'
--- a/storage/falcon/Cache.cpp	2008-09-04 14:49:10 +0000
+++ b/storage/falcon/Cache.cpp	2008-09-04 17:28:23 +0000
@@ -76,7 +76,7 @@ Cache::Cache(Database *db, int pageSz, i
 	pageSize = pageSz;
 
 	unsigned int highBit;
-	for (highBit=0x01; highBit < hashSz; highBit= highBit << 1) { }
+	for (highBit=0x01; highBit < (unsigned int)hashSz; highBit= highBit << 1) { }
 
 	// if there are more than 4096 buckets then lets round down
 	// else lets round up

Thread
bzr push into mysql-6.0-falcon branch (klong:2810 to 2811) Kelly Long4 Sep