Commit a8c13c34 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/sql_acl.cc:
  Auto merged
parents 74e7b09c e1827da7

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign 


# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \

			README COPYING EXCEPTIONS-CLIENT cmakelists.txt

			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt

SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

client/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ strings_src=decimal.c 
DEFS =			-DUNDEF_THREADS_HACK \

			-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \

			-DDATADIR="\"$(localstatedir)\"" 

EXTRA_DIST =		get_password.c cmakelists.txt

EXTRA_DIST =		get_password.c CMakeLists.txt



link_sources:

	for f in $(sql_src) ; do \

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -58,5 +58,5 @@ enum options_client 
  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT

};

client/mysql.cc

+2 −0
Original line number Diff line number Diff line
@@ -3144,6 +3144,8 @@ sql_real_connect(char *host,char *database,char *user,char *password, 
  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,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                (char*)&opt_ssl_verify_server_cert);

#endif

  if (opt_protocol)

    mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);

client/mysqladmin.cc

+2 −0
Original line number Diff line number Diff line
@@ -340,6 +340,8 @@ int main(int argc,char *argv[]) 
  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,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                (char*)&opt_ssl_verify_server_cert);

#endif

  if (opt_protocol)

    mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);