From a6a4fa1d6f00c2872cc6fd4ff103b7c4a5a9db8d Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mnogosearch.org>
Date: Sat, 20 Apr 2013 19:23:33 +0400
Subject: [PATCH] Fixing a few problems found by Build Bot after merging the
 CONNECT engine.

modified:
  @ mysql-test/r/mysqld--help.result
  @ mysql-test/t/mysqld--help.test
  Supressing information about "--connect" in "mysqld --help" output,
  as it depends on the build parameters.
  As a side effect information about --connect-timeout is now also suppressed :(

  @ storage/connect/CMakeLists.txt
  Removing gcc warning switches that do not exists in some older gcc versions.

  @ storage/connect/ha_connect.cc
  Adding a quick fix: cast from "const char *" to "char *".
  Olivier should do a better fix eventually.
---
 mysql-test/r/mysqld--help.result |  3 ---
 mysql-test/t/mysqld--help.test   |  2 +-
 storage/connect/CMakeLists.txt   | 12 ++++++++----
 storage/connect/ha_connect.cc    |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index a3f402b7568..74faa205981 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -108,8 +108,6 @@ The following options may be given as the first argument:
  --concurrent-insert[=name] 
  Use concurrent insert with MyISAM. Possible values are
  NEVER, AUTO, ALWAYS
- --connect-timeout=# The number of seconds the mysqld server is waiting for a
- connect packet before responding with 'Bad handshake'
  --console           Write error output on screen; don't remove the console
  window on windows.
  --core-file         Write core on errors.
@@ -1003,7 +1001,6 @@ chroot (No default value)
 collation-server latin1_swedish_ci
 completion-type NO_CHAIN
 concurrent-insert AUTO
-connect-timeout 10
 console FALSE
 date-format %Y-%m-%d
 datetime-format %Y-%m-%d %H:%i:%s
diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test
index 0f3df10ea70..17969b65fb5 100644
--- a/mysql-test/t/mysqld--help.test
+++ b/mysql-test/t/mysqld--help.test
@@ -26,7 +26,7 @@ perl;
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster
               feedback debug temp-pool ssl des-key-file xtradb sequence
               thread-concurrency super-large-pages mutex-deadlock-detector
-              null-audit aria pbxt oqgraph sphinx thread-handling
+              connect null-audit aria pbxt oqgraph sphinx thread-handling
               test-sql-discovery rpl-semi-sync query-cache-info/;
 
   # And substitute the content some environment variables with their
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index eae4d9a25bc..ab633ab9fa2 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -44,20 +44,24 @@ add_definitions( -DHUGE_SUPPORT -DZIP_SUPPORT )
 #
 IF(UNIX)
   if(WITH_WARNINGS)
-    add_definitions(-Wall -Wfatal-errors -Wextra -Wmissing-declarations)
+    # Bar: -Wfatal-errors removed (does not present in gcc on solaris10)
+    add_definitions(-Wall -Wextra -Wmissing-declarations)
     add_definitions(-Wno-non-virtual-dtor)
     message(STATUS "CONNECT: GCC: All warnings enabled")
   else()
     add_definitions(-Wall -Wfatal-errors -Wmissing-declarations)
     add_definitions(-Wno-write-strings)
     add_definitions(-Wno-unused-variable)
-    add_definitions(-Wno-unused-but-set-variable)
+    # Bar: -Wno-unused-but-set-variables commented (does not present on sol10)
+    # add_definitions(-Wno-unused-but-set-variable)
     add_definitions(-Wno-unused-value)
     add_definitions(-Wno-unused-function)
     add_definitions(-Wno-parentheses)
     add_definitions(-Wno-missing-declarations)
-    add_definitions(-Wno-int-to-pointer-cast)
-    add_definitions(-Wno-narrowing)
+    # Bar: -Wno-int-to-pointer-cast commended (does not present in gcc on sol10)
+    # add_definitions(-Wno-int-to-pointer-cast)
+    # Bar: -Wno-narrowing commented (does not present in gcc on solaris10)
+    # add_definitions(-Wno-narrowing)
     add_definitions(-Wno-non-virtual-dtor)
 
 # This switch is for pure C only:
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 20d35806777..54667a393cc 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -3475,10 +3475,10 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd,
         switch (fnc) {
           case FNC_NO:
           case FNC_COL:
-            qrp= ODBCColumns(g, dsn, tab, NULL, fnc == FNC_COL);
+            qrp= ODBCColumns(g, dsn, (char *) tab, NULL, fnc == FNC_COL);
             break;
           case FNC_TABLE:
-            qrp= ODBCTables(g, dsn, tab, true);
+            qrp= ODBCTables(g, dsn, (char *) tab, true);
             break;
           case FNC_DSN:
             qrp= ODBCDataSources(g, true);