bzr push into mysql-5.1 branch (ole.john.aske:3053 to 3054) Bug#40548

[Ole John Aske]

 3054 Olav Sandstaa	2008-11-07
      Fix on bug#40548, Telco 6.4, SunStudio build break
modified:
  sql/mysqld.cc
  storage/ndb/include/ndbinfo.h
  storage/ndb/src/common/transporter/TransporterRegistry.cpp
  storage/ndb/src/cw/cpcd/APIService.cpp

 3053 Magnus Svensson	2008-11-06 [merge]
      Merge
modified:
  BUILD/SETUP.sh

=== modified file 'sql/mysqld.cc'

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-10-31 15:25:01 +0000
+++ b/sql/mysqld.cc	2008-11-07 08:52:22 +0000
@@ -380,7 +380,7 @@
 bool opt_disable_networking=0, opt_skip_show_db=0;
 my_bool opt_character_set_client_handshake= 1;
 bool server_id_supplied = 0;
-bool opt_endinfo, using_udf_functions;
+bool using_udf_functions;
 my_bool locked_in_memory;
 bool opt_using_transactions;
 bool volatile abort_loop;
@@ -412,14 +412,10 @@
 
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 const char *opt_ndbcluster_connectstring= 0;
-const char *opt_ndb_connectstring= 0;
 char opt_ndb_constrbuf[1024]= {0};
-unsigned opt_ndb_constrbuf_len= 0;
 my_bool	opt_ndb_shm;
 ulong opt_ndb_cache_check_time, opt_ndb_wait_connected;
 ulong opt_ndb_cluster_connection_pool;
-const char *opt_ndb_mgmd;
-ulong opt_ndb_nodeid;
 ulong ndb_extra_logging;
 ulong ndb_report_thresh_binlog_epoch_slip= 0;
 ulong ndb_report_thresh_binlog_mem_usage= 0;
@@ -427,6 +423,11 @@
 my_bool opt_ndb_log_updated_only= FALSE;
 my_bool opt_ndb_log_orig= FALSE;
 
+extern bool opt_endinfo;
+extern const char *opt_ndb_connectstring;
+extern unsigned opt_ndb_constrbuf_len;
+extern const char *opt_ndb_mgmd;
+extern ulong opt_ndb_nodeid;
 extern const char *ndb_distribution_names[];
 extern TYPELIB ndb_distribution_typelib;
 extern const char *opt_ndb_distribution;

=== modified file 'storage/ndb/include/ndbinfo.h'
--- a/storage/ndb/include/ndbinfo.h	2008-10-08 10:52:32 +0000
+++ b/storage/ndb/include/ndbinfo.h	2008-11-07 08:52:22 +0000
@@ -39,7 +39,7 @@
 
 struct ndbinfo_table {
   NDBINFO_TABLE_MEMBERS
-  struct ndbinfo_column col[];
+  struct ndbinfo_column col[0];
 };
 
 /* because MSVC compiler hates you (or rather, zero length arrays) */

=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-11-06 10:17:49 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2008-11-07 08:52:22 +0000
@@ -1916,7 +1916,7 @@
   SendBufferPage *page = b->m_first_page;
   while (page != NULL && count < max)
   {
-    dst[count].iov_base = page->m_data+page->m_start;
+    dst[count].iov_base = (char*)page->m_data+page->m_start;
     dst[count].iov_len = page->m_bytes;
     assert(page->m_start + page->m_bytes <= page->max_data_bytes());
     page = page->m_next;

=== modified file 'storage/ndb/src/cw/cpcd/APIService.cpp'
--- a/storage/ndb/src/cw/cpcd/APIService.cpp	2008-09-17 13:23:21 +0000
+++ b/storage/ndb/src/cw/cpcd/APIService.cpp	2008-11-07 08:52:22 +0000
@@ -151,7 +151,7 @@
 }
 
 CPCDAPISession::CPCDAPISession(FILE * f, CPCD & cpcd)
-  : SocketServer::Session::Session(my_socket_create_invalid())
+  : SocketServer::Session(my_socket_create_invalid())
   , m_cpcd(cpcd)
 {
   m_input = new FileInputStream(f);