List:Commits« Previous MessageNext Message »
From:jonas oreland Date:November 3 2010 6:03pm
Subject:bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3337 to
3338)
View as plain text  
 3338 jonas oreland	2010-11-03 [merge]
      ndb spj - merge compile fix

    modified:
      storage/ndb/test/run-test/atrt.hpp
 3337 Jonas Oreland	2010-11-03 [merge]
      ndb spj svs - merge 70-main

    modified:
      configure.in
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_index_unique.result
      mysql-test/suite/ndb/r/ndbinfo.result
      mysql-test/suite/ndb/t/ndb_basic.test
      mysql-test/suite/ndb/t/ndb_index_unique.test
      mysql-test/suite/ndb/t/ndbinfo.test
      scripts/mysql_system_tables.sql
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.h
      sql/partition_info.h
      sql/sql_partition.cc
      storage/ndb/CMakeLists.txt
      storage/ndb/include/kernel/signaldata/BuildIndxImpl.hpp
      storage/ndb/include/kernel/signaldata/CopyData.hpp
      storage/ndb/include/kernel/signaldata/LqhKey.hpp
      storage/ndb/include/kernel/signaldata/ScanFrag.hpp
      storage/ndb/include/kernel/signaldata/SumaImpl.hpp
      storage/ndb/include/logger/SysLogHandler.hpp
      storage/ndb/ndb_configure.m4
      storage/ndb/src/common/portlib/NdbNuma.cpp
      storage/ndb/src/kernel/angel.cpp
      storage/ndb/src/kernel/angel.hpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.hpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/pgman.cpp
      storage/ndb/src/kernel/blocks/pgman.hpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.hpp
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
      storage/ndb/src/kernel/blocks/trix/Trix.hpp
      storage/ndb/src/kernel/main.cpp
      storage/ndb/src/kernel/vm/DLList.hpp
      storage/ndb/src/kernel/vm/Ndbinfo.hpp
      storage/ndb/src/kernel/vm/NdbinfoTables.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/test/ndbapi/testBackup.cpp
      storage/ndb/test/ndbapi/test_event.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/tools/ndbinfo_sql.cpp
=== modified file 'storage/ndb/test/run-test/atrt.hpp'
--- a/storage/ndb/test/run-test/atrt.hpp	2010-08-23 08:46:34 +0000
+++ b/storage/ndb/test/run-test/atrt.hpp	2010-11-03 18:00:22 +0000
@@ -28,6 +28,7 @@
 #include <CpcClient.hpp>
 #include <Properties.hpp>
 #include <mysql.h>
+#include <my_dir.h>
 
 enum ErrorCodes 
 {

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3337 to3338) jonas oreland3 Nov