Commit 71cc2424 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
parents 7589de6c dc618494

client/mysql.cc

+2 −3
Original line number Diff line number Diff line
@@ -3212,10 +3212,9 @@ com_status(String *buffer __attribute__((unused)), 
      mysql_free_result(result);

    } 

#ifdef HAVE_OPENSSL

    if (mysql.net.vio && mysql.net.vio->ssl_arg &&

	SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg))

    if (mysql_get_ssl_cipher(&mysql))

      tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",

		  SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg));

		  mysql_get_ssl_cipher(&mysql));

    else

#endif /* HAVE_OPENSSL */

      tee_puts("SSL:\t\t\tNot in use", stdout);

include/mysql.h

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ MYSQL * STDCALL mysql_init(MYSQL *mysql); 
my_bool		STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,

				      const char *cert, const char *ca,

				      const char *capath, const char *cipher);

const char *    STDCALL mysql_get_ssl_cipher(MYSQL *mysql);

my_bool		STDCALL mysql_change_user(MYSQL *mysql, const char *user, 

					  const char *passwd, const char *db);

MYSQL *		STDCALL mysql_real_connect(MYSQL *mysql, const char *host,

mysql-test/r/ndb_alter_table2.result

0 → 100644
+42 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (

a INT NOT NULL PRIMARY KEY,

b INT NOT NULL

) ENGINE=ndbcluster;

BEGIN;

INSERT INTO t1 VALUES (9410,9412);

BEGIN;

INSERT INTO t1 VALUES (9411,9412);

BEGIN;

INSERT INTO t1 VALUES (9412,9412);

BEGIN;

INSERT INTO t1 VALUES (9413,9412);

BEGIN;

INSERT INTO t1 VALUES (9414,9412);

BEGIN;

INSERT INTO t1 VALUES (9415,9412);

ROLLBACK;

ROLLBACK;

ROLLBACK;

ROLLBACK;

ROLLBACK;

ROLLBACK;

drop table t1;

CREATE TABLE t1 (

a INT NOT NULL PRIMARY KEY,

b INT NOT NULL,

c INT NOT NULL

) ENGINE=ndbcluster;

select * from t1;

a	b	c

select * from t1;

a	b	c

select * from t1;

a	b	c

select * from t1;

a	b	c

select * from t1;

a	b	c

select * from t1;

a	b	c

drop table t1;

mysql-test/t/ndb_alter_table2.test

0 → 100644
+82 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/have_multi_ndb.inc

-- source include/not_embedded.inc



--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings



connect (con1,localhost,root,,test);

connect (con2,localhost,root,,test);

connect (con3,localhost,root,,test);

connect (con4,localhost,root,,test);

connect (con5,localhost,root,,test);

connect (con6,localhost,root,,test);



CREATE TABLE t1 (

  a INT NOT NULL PRIMARY KEY,

  b INT NOT NULL

) ENGINE=ndbcluster;



connection con1;

BEGIN;

INSERT INTO t1 VALUES (9410,9412);

connection con2;

BEGIN;

--send

INSERT INTO t1 VALUES (9411,9412);

connection con3;

BEGIN;

--send

INSERT INTO t1 VALUES (9412,9412);

connection con4;

BEGIN;

--send

INSERT INTO t1 VALUES (9413,9412);

connection con5;

BEGIN;

--send

INSERT INTO t1 VALUES (9414,9412);

connection con6;

BEGIN;

--send

INSERT INTO t1 VALUES (9415,9412);

connection con1;

sleep 1;



ROLLBACK;

connection con2;

reap;

ROLLBACK;

connection con3;

reap;

ROLLBACK;

connection con4;

reap;

ROLLBACK;

connection con5;

reap;

ROLLBACK;

connection con6;

reap;

ROLLBACK;



connection server2;



drop table t1;

CREATE TABLE t1 (

  a INT NOT NULL PRIMARY KEY,

  b INT NOT NULL,

  c INT NOT NULL

) ENGINE=ndbcluster;



connection server1;



select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;

select * from t1;



drop table t1;

sql-common/client.c

+21 −0
Original line number Diff line number Diff line
@@ -1535,6 +1535,27 @@ mysql_ssl_free(MYSQL *mysql __attribute__((unused))) 
  mysql->connector_fd = 0;

  DBUG_VOID_RETURN;

}





/*

  Return the SSL cipher (if any) used for current

  connection to the server.



  SYNOPSYS

    mysql_get_ssl_cipher()

      mysql pointer to the mysql connection



*/



const char * STDCALL

mysql_get_ssl_cipher(MYSQL *mysql)

{

  DBUG_ENTER("mysql_get_ssl_cipher");

  if (mysql->net.vio && mysql->net.vio->ssl_arg)

    SSL_get_cipher_name((SSL*)mysql->net.vio->ssl_arg);

  DBUG_RETURN(NULL);

}



#endif /* HAVE_OPENSSL */