Commit a6c8de91 authored by unknown's avatar unknown
Browse files

Clean up after big merge 


config/ac-macros/yassl.m4:
  Fix like of yassl makefiles after merge
mysql-test/lib/mtr_process.pl:
  Re-add line accidently cut out during merge
mysql-test/mysql-test-run.pl:
  Don't start up ndbcluster slave if we don't need it, and fix how
  NDB_STATUS_OK is defined
mysql-test/r/rpl_openssl.result:
  Update results
sql/mysqld.cc:
  Remove duplicate of have_dlopen (bad merge)
sql/set_var.cc:
  Remove duplicate of prepared_stmt_count (bad merge)
parent c3c5f8d6

config/ac-macros/yassl.m4

+4 −1
Original line number Diff line number Diff line
@@ -11,8 +11,11 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    AC_MSG_RESULT([using bundled yaSSL])

    AC_CONFIG_FILES(extra/yassl/Makefile dnl

    extra/yassl/taocrypt/Makefile dnl

    extra/yassl/taocrypt/benchmark/Makefile dnl

    extra/yassl/taocrypt/src/Makefile dnl

    extra/yassl/src/Makefile)

    extra/yassl/taocrypt/test/Makefile dnl

    extra/yassl/src/Makefile dnl

    extra/yassl/testsuite/Makefile)

    yassl_dir="yassl"

    yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"

    yassl_includes="-I\$(top_srcdir)/extra/yassl/include"

mysql-test/lib/mtr_process.pl

+1 −0
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ sub mtr_mysqladmin_shutdown { 
    # Shutdown time must be high as slave may be in reconnect

    mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo");

    mtr_add_arg($args, "shutdown");

    my $path_mysqladmin_log= "$::opt_vardir/log/mysqladmin.log";

    # Start mysqladmin in paralell and wait for termination later

    my $pid= mtr_spawn($::exe_mysqladmin, $args,

                       "", $path_mysqladmin_log, $path_mysqladmin_log, "",

mysql-test/mysql-test-run.pl

+4 −3
Original line number Diff line number Diff line
@@ -428,7 +428,8 @@ sub main () { 
      $need_im||= $test->{component_id} eq 'im';

      $use_slaves||= $test->{slave_num};

    }

    $opt_with_ndbcluster= 0 unless $need_ndbcluster;

    $opt_with_ndbcluster= $opt_with_ndbcluster_slave= 0

      unless $need_ndbcluster;

    $opt_skip_im= 1 unless $need_im;



    snapshot_setup();
@@ -3234,8 +3235,8 @@ sub run_mysqltest ($) { 
  $ENV{'UDF_EXAMPLE_LIB'}=

    ($lib_udf_example ? basename($lib_udf_example) : "");



  $ENV{'NDB_STATUS_OK'}=            $flag_ndb_status_ok;

  $ENV{'NDB_SLAVE_STATUS_OK'}=      $flag_ndb_slave_status_ok;

  $ENV{'NDB_STATUS_OK'}=            $flag_ndb_status_ok ? "YES" : "NO";

  $ENV{'NDB_SLAVE_STATUS_OK'}=      $flag_ndb_slave_status_ok ? "YES" : "NO";

  $ENV{'NDB_EXTRA_TEST'}=           $opt_ndb_extra_test;

  $ENV{'NDB_MGM'}=                  $exe_ndb_mgm;

  $ENV{'NDB_BACKUP_DIR'}=           $path_ndb_data_dir;

mysql-test/r/rpl_openssl.result

+1 −1
Original line number Diff line number Diff line
@@ -28,4 +28,4 @@ drop user replssl@localhost; 
drop table t1;

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	564	#	#	master-bin.000001	Yes	Yes							0		0	564	#	None		0	No	MYSQL_TEST_DIR/std_data/cacert.pem		MYSQL_TEST_DIR/std_data/client-cert.pem		MYSQL_TEST_DIR/std_data/client-key.pem	#
 
#	127.0.0.1	root	MASTER_MYPORT	1	#	#	#	#	#	#	Yes				#			0		0	#	#	None		0	No	MYSQL_TEST_DIR/std_data/cacert.pem		MYSQL_TEST_DIR/std_data/client-cert.pem		MYSQL_TEST_DIR/std_data/client-key.pem	#

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ CHARSET_INFO *character_set_filesystem; 


SHOW_COMP_OPTION have_row_based_replication;

SHOW_COMP_OPTION have_openssl, have_symlink, have_dlopen, have_query_cache;

SHOW_COMP_OPTION have_geometry, have_rtree_keys, have_dlopen;

SHOW_COMP_OPTION have_geometry, have_rtree_keys;

SHOW_COMP_OPTION have_crypt, have_compress;



/* Thread specific variables */