Commit f296bb09 authored May 09, 2006 by unknown

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  manual merge
include/violite.h:
  Automatic
mysql-test/Makefile.am:
  manual merge
mysql-test/r/mysqldump.result:
  Automatic
mysql-test/r/rpl_user_variables.result:
  Manual merge (diff is because lars removed displaying of binlog)
mysql-test/t/disabled.def:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge
mysql-test/t/rpl_user_variables.test:
  manual merge (Changes becasue of lars removed binlog logging)
sql/mysqld.cc:
  manual merge
vio/viossl.c:
  manual merge
vio/viosslfactories.c:
  manual merge
client/client_priv.h.rej:
  merge 5.0 -> 5.1

parents 893317ae d6c2616c

client/client_priv.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ enum options_client
		OPT_MYSQL_PRESERVE_SCHEMA,
		OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
		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
		};

client/client_priv.h.rej

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		***************
		* 50,55 **
		OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
		#endif
		OPT_TRIGGERS,
		OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
		! OPT_TZ_UTC, OPT_AUTO_CLOSE
		};
		--- 50,55 ----
		OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
		#endif
		OPT_TRIGGERS,
		OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
		! OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT
		};

client/mysql.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -3144,6 +3144,8 @@ sql_real_connect(char host,char database,char user,char password,
		if (opt_use_ssl)
		mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
		opt_ssl_capath, opt_ssl_cipher);
		mysql_options(&mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
		(char*)&opt_ssl_verify_server_cert);
		#endif
		if (opt_protocol)
		mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);

client/mysqladmin.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,8 @@ int main(int argc,char *argv[])
		if (opt_use_ssl)
		mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
		opt_ssl_capath, opt_ssl_cipher);
		mysql_options(&mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
		(char*)&opt_ssl_verify_server_cert);
		#endif
		if (opt_protocol)
		mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);

client/mysqldump.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -918,6 +918,8 @@ static int dbConnect(char host, char user,char *passwd)
		if (opt_use_ssl)
		mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
		opt_ssl_capath, opt_ssl_cipher);
		mysql_options(&mysql_connection,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
		(char*)&opt_ssl_verify_server_cert);
		#endif
		if (opt_protocol)
		mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);