List:Commits« Previous MessageNext Message »
From:jani Date:May 12 2006 10:38am
Subject:bk commit into 5.1 tree (jani:1.2134)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani 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.2134 06/05/12 13:37:56 jani@stripped +32 -0
  Merge jamppa@stripped:/home/bk/mysql-5.1-new
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509

  mysql-test/Makefile.am
    1.78 06/05/12 13:37:50 jani@stripped +0 -1
    Manual merge.

  vio/viosslfactories.c
    1.28 06/05/12 13:32:01 jani@stripped +0 -1
    Auto merged

  vio/viossl.c
    1.36 06/05/12 13:32:01 jani@stripped +0 -0
    Auto merged

  vio/vio.c
    1.30 06/05/12 13:32:01 jani@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
    1.16 06/05/12 13:32:01 jani@stripped +0 -0
    Auto merged

  sql-common/client.c
    1.98 06/05/12 13:32:01 jani@stripped +0 -0
    Auto merged

  sql/sql_acl.cc
    1.192 06/05/12 13:32:00 jani@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.542 06/05/12 13:32:00 jani@stripped +0 -0
    Auto merged

  sql/mysql_priv.h
    1.401 06/05/12 13:32:00 jani@stripped +0 -0
    Auto merged

  sql/item_func.cc
    1.292 06/05/12 13:32:00 jani@stripped +0 -0
    Auto merged

  mysql-test/t/mysqldump.test
    1.99 06/05/12 13:32:00 jani@stripped +0 -0
    Auto merged

  mysql-test/t/information_schema.test
    1.78 06/05/12 13:32:00 jani@stripped +0 -0
    Auto merged

  mysql-test/t/disabled.def
    1.154 06/05/12 13:32:00 jani@stripped +0 -0
    Auto merged

  mysql-test/std_data/server-key.pem
    1.9 06/05/12 13:32:00 jani@stripped +0 -0
    Auto merged

  mysql-test/std_data/server-cert.pem
    1.10 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  mysql-test/std_data/client-key.pem
    1.9 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  mysql-test/std_data/client-cert.pem
    1.10 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  mysql-test/std_data/cacert.pem
    1.10 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  mysql-test/r/information_schema.result
    1.119 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.114 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  libmysql/libmysql.c
    1.252 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  include/violite.h
    1.49 06/05/12 13:31:59 jani@stripped +0 -1
    Auto merged

  include/mysql.h
    1.162 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  client/mysqltest.c
    1.210 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  client/mysqlimport.c
    1.74 06/05/12 13:31:59 jani@stripped +0 -1
    Auto merged

  client/mysqldump.c
    1.237 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  client/mysql.cc
    1.208 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  client/client_priv.h
    1.57 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4
    1.5 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8
    1.5 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-NOTES~e926d3e6929ac052
    1.5 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6
    1.4 06/05/12 13:31:59 jani@stripped +0 -0
    Auto merged

# 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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.1-new-merge_060509/RESYNC

--- 1.541/sql/mysqld.cc	2006-05-09 20:50:22 +03:00
+++ 1.542/sql/mysqld.cc	2006-05-12 13:32:00 +03:00
@@ -1219,6 +1219,7 @@
   delete binlog_filter;
   delete rpl_filter;
   end_ssl();
+  vio_end();
 #ifdef USE_REGEX
   my_regex_end();
 #endif

--- 1.56/client/client_priv.h	2006-05-09 20:50:22 +03:00
+++ 1.57/client/client_priv.h	2006-05-12 13:31:59 +03:00
@@ -59,5 +59,5 @@
   OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,
   OPT_SSL_VERIFY_SERVER_CERT,
   OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,
-  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES
+  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT
 };

--- 1.98/mysql-test/t/mysqldump.test	2006-05-11 16:34:04 +03:00
+++ 1.99/mysql-test/t/mysqldump.test	2006-05-12 13:32:00 +03:00
@@ -1186,7 +1186,7 @@
 
 # Drop table "words" and run with threads, should fail
 drop table words;
---replace_regex /.*mysqlimport/mysql-import/
+--replace_regex /.*mysqlimport(\.exe)*/mysql-import/
 --error 1
 --exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data_ln/words.dat $MYSQLTEST_VARDIR/std_data_ln/words2.dat 2>&1
 

--- 1.77/mysql-test/Makefile.am	2006-05-09 20:50:22 +03:00
+++ 1.78/mysql-test/Makefile.am	2006-05-12 13:37:50 +03:00
@@ -112,12 +112,6 @@
 uninstall-local:
 	@RM@ -f -r $(DESTDIR)$(testdir)
 
-std_data/client-key.pem: $(top_srcdir)/SSL/$(@F)
-std_data/client-cert.pem: $(top_srcdir)/SSL/$(@F)
-std_data/cacert.pem: $(top_srcdir)/SSL/$(@F)
-std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F)
-std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)
-
 SUFFIXES = .sh
 
 .sh:
Thread
bk commit into 5.1 tree (jani:1.2134)jani12 May