Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2377 06/05/01 00:14:32 jimw@stripped +6 -0
Clean up after big merge
sql/set_var.cc
1.185 06/05/01 00:14:28 jimw@stripped +0 -1
Remove duplicate of prepared_stmt_count (bad merge)
sql/mysqld.cc
1.550 06/05/01 00:14:28 jimw@stripped +1 -1
Remove duplicate of have_dlopen (bad merge)
mysql-test/r/rpl_openssl.result
1.14 06/05/01 00:14:28 jimw@stripped +1 -1
Update results
mysql-test/mysql-test-run.pl
1.112 06/05/01 00:14:28 jimw@stripped +4 -3
Don't start up ndbcluster slave if we don't need it, and fix how
NDB_STATUS_OK is defined
mysql-test/lib/mtr_process.pl
1.32 06/05/01 00:14:28 jimw@stripped +1 -0
Re-add line accidently cut out during merge
config/ac-macros/yassl.m4
1.17 06/05/01 00:14:28 jimw@stripped +4 -1
Fix like of yassl makefiles after merge
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jimw
# Host: rama.(none)
# Root: /home/jimw/my/mysql-5.1-clean
--- 1.549/sql/mysqld.cc 2006-04-30 13:13:55 -07:00
+++ 1.550/sql/mysqld.cc 2006-05-01 00:14:28 -07:00
@@ -579,7 +579,7 @@
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 */
--- 1.13/mysql-test/r/rpl_openssl.result 2006-04-30 13:27:32 -07:00
+++ 1.14/mysql-test/r/rpl_openssl.result 2006-05-01 00:14:28 -07:00
@@ -28,4 +28,4 @@
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 #
--- 1.31/mysql-test/lib/mtr_process.pl 2006-04-30 13:27:32 -07:00
+++ 1.32/mysql-test/lib/mtr_process.pl 2006-05-01 00:14:28 -07:00
@@ -672,6 +672,7 @@
# 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, "",
--- 1.111/mysql-test/mysql-test-run.pl 2006-04-30 13:27:32 -07:00
+++ 1.112/mysql-test/mysql-test-run.pl 2006-05-01 00:14:28 -07:00
@@ -428,7 +428,8 @@
$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 @@
$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;
--- 1.184/sql/set_var.cc 2006-04-30 13:27:32 -07:00
+++ 1.185/sql/set_var.cc 2006-05-01 00:14:28 -07:00
@@ -910,7 +910,6 @@
SHOW_SYS},
{"pid_file", (char*) pidfile_name, SHOW_CHAR},
{"plugin_dir", (char*) opt_plugin_dir, SHOW_CHAR},
- {sys_prepared_stmt_count.name, (char*) &sys_prepared_stmt_count, SHOW_SYS},
{"port", (char*) &mysqld_port, SHOW_INT},
{sys_preload_buff_size.name, (char*) &sys_preload_buff_size, SHOW_SYS},
{sys_prepared_stmt_count.name, (char*) &sys_prepared_stmt_count, SHOW_SYS},
--- 1.16/config/ac-macros/yassl.m4 2006-04-30 13:27:32 -07:00
+++ 1.17/config/ac-macros/yassl.m4 2006-05-01 00:14:28 -07:00
@@ -11,8 +11,11 @@
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"
| Thread |
|---|
| • bk commit into 5.1 tree (jimw:1.2377) | Jim Winstead | 1 May |
