Commit 3307de72 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/ha_ndbcluster.cc:
  Auto merged
parents 050100df bb90de39

Makefile.am

+11 −28
Original line number Diff line number Diff line
@@ -119,54 +119,37 @@ tags: 
# making sure each user use different ports.



test:

	cd mysql-test ; \

	./mysql-test-run --mysqld=--binlog-format=statement && \

	./mysql-test-run --ps-protocol --mysqld=--binlog-format=row



test-full:

	cd mysql-test ; \

	./mysql-test-run --mysqld=--binlog-format=statement && \

	./mysql-test-run --ps-protocol --mysqld=--binlog-format=statement && \

	./mysql-test-run --mysqld=--binlog-format=row && \

	./mysql-test-run --ps-protocol --mysqld=--binlog-format=row



test-force:

	cd mysql-test ; \

	./mysql-test-run --force --mysqld=--binlog-format=statement && \

	./mysql-test-run --ps-protocol --force --mysqld=--binlog-format=row



test-force-full:

	cd mysql-test ; \

	./mysql-test-run --force --mysqld=--binlog-format=statement && \

	./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=statement && \

	./mysql-test-run --force --mysqld=--binlog-format=row && \

	./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=row



# We are testing a new Perl version of the test script

test-pl:

	cd mysql-test ; \

	./mysql-test-run.pl --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row



test-full-pl:

test-full:

	cd mysql-test ; \

	./mysql-test-run.pl --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --mysqld=--binlog-format=row && \

	./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row



test-force-pl:

test-force:

	cd mysql-test ; \

	./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --ps-protocol --force --mysqld=--binlog-format=row



test-force-full-pl:

test-force-full:

	cd mysql-test ; \

	./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=statement && \

	./mysql-test-run.pl --force --mysqld=--binlog-format=row && \

	./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=row



# Keep these for a while

test-pl:	test

test-full-pl:	test-full

test-force-pl:	test-force

test-force-full-pl: test-force-full







# Don't update the files from bitkeeper

%::SCCS/s.%

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 ((status= 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));

		  status);

    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,

libmysql/Makefile.shared

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ 
			-DDATADIR="\"$(MYSQLDATAdir)\"" \

			-DDEFAULT_HOME_ENV=MYSQL_HOME \

			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \

			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \

			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)



if HAVE_YASSL

libmysql/libmysql.def

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ EXPORTS 
	mysql_get_proto_info

	mysql_get_server_info

	mysql_get_client_version

	mysql_get_ssl_cipher

	mysql_info

	mysql_init

	mysql_insert_id