Fix for SSL and new my_getopt

Fix for syntax error bug in SET TRANSACTION ISOLATION



BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
  Delete: include/sslopt-case.h
client/mysql.cc:
  Fix for SSL and new my_getopt
client/mysqladmin.c:
  Fix for SSL and new my_getopt
client/mysqlcheck.c:
  Fix for SSL and new my_getopt
client/mysqldump.c:
  Fix for SSL and new my_getopt
client/mysqlimport.c:
  Fix for SSL and new my_getopt
client/mysqlshow.c:
  Fix for SSL and new my_getopt
include/Makefile.am:
  Fix for SSL and new my_getopt
include/sslopt-longopts.h:
  Fix for SSL and new my_getopt
libmysql/libmysql.c:
  Fix for SSL and new my_getopt
mysql-test/r/innodb.result:
  Simple test of transaction isolations
mysql-test/t/innodb.test:
  Simple test of transaction isolations
sql/mini_client.cc:
  Merge of mysql_real_connect() with libmysql.c
sql/mysqld.cc:
  Simple test of transaction isolations
  Remove use of current_thd in get_options()
sql/slave.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fix for SET TRANSACTION ...

3 files changed, 2 insertions, 50 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 576f557cdd3..67132b4c4a4 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -20,7 +20,7 @@ pkginclude_HEADERS =	dbug.h m_string.h my_sys.h my_list.h \
 			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
 		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
 			errmsg.h my_global.h my_net.h my_alloc.h\
-			sslopt-case.h sslopt-longopts.h sslopt-usage.h \
+			sslopt-longopts.h sslopt-usage.h \
 			sslopt-vars.h $(BUILT_SOURCES)
 noinst_HEADERS =	config-win.h config-os2.h \
 			nisam.h heap.h merge.h my_bitmap.h\
diff --git a/include/sslopt-case.h b/include/sslopt-case.h
deleted file mode 100644
index bc6a46fc776..00000000000
--- a/include/sslopt-case.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifdef HAVE_OPENSSL
-    case OPT_SSL_SSL:
-      opt_use_ssl = 1;				/* true */
-      break;
-    case OPT_SSL_KEY:
-      opt_use_ssl = 1;				/* true */
-/* QQ to be removed???      my_free(opt_ssl_key, MYF(MY_ALLOW_ZERO_PTR)); */
-/* QQ to be removed???      opt_ssl_key = my_strdup(optarg, MYF(0)); */
-      my_free(opt_ssl_key, MYF(MY_ALLOW_ZERO_PTR)); 
-      opt_ssl_key = my_strdup(argument, MYF(0)); 
-      break;
-    case OPT_SSL_CERT:
-      opt_use_ssl = 1;				/* true */
-      my_free(opt_ssl_cert, MYF(MY_ALLOW_ZERO_PTR));
-      opt_ssl_cert = my_strdup(argument, MYF(0));
-      break;
-    case OPT_SSL_CA:
-      opt_use_ssl = 1;				/* true */
-      my_free(opt_ssl_ca, MYF(MY_ALLOW_ZERO_PTR));
-      opt_ssl_ca = my_strdup(argument, MYF(0));
-      break;
-    case OPT_SSL_CAPATH:
-      opt_use_ssl = 1;				/* true */
-      my_free(opt_ssl_capath, MYF(MY_ALLOW_ZERO_PTR));
-      opt_ssl_capath = my_strdup(argument, MYF(0));
-      break;
-    case OPT_SSL_CIPHER:
-      opt_use_ssl = 1;				/* true */
-      my_free(opt_ssl_cipher, MYF(MY_ALLOW_ZERO_PTR));
-      opt_ssl_cipher = my_strdup(argument, MYF(0));
-      break;
-#endif
diff --git a/include/sslopt-longopts.h b/include/sslopt-longopts.h
index d82c833c439..811fbcbbdd6 100644
--- a/include/sslopt-longopts.h
+++ b/include/sslopt-longopts.h
@@ -34,7 +34,7 @@
    "CA directory (check OpenSSL docs, implies --ssl)",
    (gptr*) &opt_ssl_capath, (gptr*) &opt_ssl_capath, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
-  {"ssl-cipher", OPT_SSL_CAPATH, "SSL cipher to use (implies --ssl)",
+  {"ssl-cipher", OPT_SSL_CIPHER, "SSL cipher to use (implies --ssl)",
    (gptr*) &opt_ssl_cipher, (gptr*) &opt_ssl_cipher, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},