Commit 7c5b7438 authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/gluh/MySQL/Merge/5.0
parents 81878d7a 97b4446a

include/sslopt-longopts.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
   0, 0, 0, 0, 0, 0},

#ifdef MYSQL_CLIENT

  {"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT,

   "Verify servers \"Common Name\" in it's cert against hostname used when connecting. This option is disabled by default.",

   "Verify server's \"Common Name\" in its cert against hostname used when connecting. This option is disabled by default.",

   (gptr*) &opt_ssl_verify_server_cert, (gptr*) &opt_ssl_verify_server_cert,

    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

mysql-test/r/rpl_temporary.result

+0 −2
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ create temporary table t102 (id int); 
set @session.pseudo_thread_id=200;

create temporary table t201 (id int);

create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);

set @con1_id=connection_id();

kill @con1_id;

create table t1(f int);

insert into t1 values (1);

select * from t1 /* must be 1 */;

mysql-test/t/rpl_temporary.test

+12 −2
Original line number Diff line number Diff line
@@ -169,8 +169,18 @@ create temporary table t102 (id int); 
set @session.pseudo_thread_id=200;

create temporary table t201 (id int);

create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);

set @con1_id=connection_id();

kill @con1_id;



#

# Don't kill our own connection to the server as

# the result code differs depending on platform.

#

# Select the id to kill into a variable of mysqltest

let $con1_id= `select connection_id()`;

# Switch connection to avoid killing our own connection

connection master;

--disable_query_log

eval kill $con1_id;

--enable_query_log



#now do something to show that slave is ok after DROP temp tables

connection master;