Some fixes that were not done in original merge, compilation revealed.

client/mysqlimport.c:
  Fixed a problem with merge.
include/violite.h:
  Struct name changed, but forgot to change it here.
sql/sql_show.cc:
  Added missing variable.

client/mysqlimport.c

@@ -406,7 +406,7 @@ static MYSQL *db_connect(char *host, char *database,
   if (opt_use_ssl)
     mysql_ssl_set(mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
 		  opt_ssl_capath, opt_ssl_cipher);
-  mysql_options(&mysql_connection,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+  mysql_options(mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
                 (char*)&opt_ssl_verify_server_cert);
 #endif
   if (opt_protocol)

include/violite.h

@@ -121,7 +121,7 @@ struct st_VioSSLFd
 *new_VioSSLAcceptorFd(const char *key_file, const char *cert_file,
 		      const char *ca_file,const char *ca_path,
 		      const char *cipher);
-void free_vio_ssl_acceptor_fd(struct st_VioSSLAcceptorFd *fd);
+void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd);
 #endif /* HAVE_OPENSSL */
 
 #ifdef HAVE_SMEM

sql/sql_show.cc

@@ -938,6 +938,11 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
                                                      MODE_DB2 |
                                                      MODE_MAXDB |
                                                      MODE_ANSI)) != 0;
+
+  bool limited_mysql_mode= (thd->variables.sql_mode &
+                            (MODE_NO_FIELD_OPTIONS | MODE_MYSQL323 |
+                             MODE_MYSQL40)) != 0;
+
   DBUG_ENTER("store_create_info");
   DBUG_PRINT("enter",("table: %s", table->s->table_name.str));