Commit f68085c4 authored Aug 12, 2006 by unknown

Merge bodhi.local:/opt/local/work/tmp_merge

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
  Auto merged
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
dbug/dbug.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_compress.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqlcheck.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.h:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
mysql-test/r/im_life_cycle.result:
  e
  use local
mysql-test/r/ps.result:
  use local
client/Makefile.am:
  Manual merge.
client/mysqlimport.c:
  Manual merge.
configure.in:
  Manual merge.
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/r/mysqldump.result:
  Manual merge.
mysql-test/r/mysqltest.result:
  Manual merge.
mysql-test/r/ndb_basic.result:
  Manual merge.
mysql-test/r/rpl_view.result:
  Manual merge.
mysql-test/r/show_check.result:
  Manual merge.
mysql-test/r/sp-error.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/r/union.result:
  Manual merge.
mysql-test/t/mysqldump.test:
  Manual merge.
mysql-test/t/mysqltest.test:
  Manual merge.
mysql-test/t/ndb_basic.test:
  Manual merge.
mysql-test/t/rpl_sp.test:
  Manual merge.
mysql-test/t/rpl_view.test:
  Manual merge.
mysql-test/t/show_check.test:
  Manual merge.
mysql-test/t/sp-error.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/item_sum.cc:
  Manual merge.
sql/mysql_priv.h:
  Manual merge.
sql/sp_head.cc:
  Manual merge.
sql/sql_db.cc:
  Manual merge.
sql/sql_delete.cc:
  Manual merge.
sql/sql_lex.h:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

parents eef51cd8 4abe4b17

.bzrignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -943,6 +943,7 @@ ndb/src/common/mgmcommon/printConfig/*.d
		ndb/src/common/portlib/libportlib.dsp
		ndb/src/common/transporter/libtransporter.dsp
		ndb/src/common/util/libgeneral.dsp
		ndb/src/common/util/testBitmask.cpp
		ndb/src/cw/cpcd/ndb_cpcd
		ndb/src/dummy.cpp
		ndb/src/kernel/blocks/backup/libbackup.dsp

client/Makefile.am

+6 −6

Original line number	Diff line number	Diff line
		@@ -64,11 +64,11 @@ mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
		$(top_builddir)/mysys/libmysys.a
		mysqlcheck_SOURCES= mysqlcheck.c $(yassl_dummy_link_fix)
		mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix)
		mysqlslap_SOURCES= mysqlslap.c \
		$(yassl_dummy_link_fix)
		mysqldump_SOURCES= mysqldump.c my_user.c $(yassl_dummy_link_fix)
		mysqlimport_SOURCES= mysqlimport.c \
		mysqlslap_SOURCES= mysqlslap.c $(yassl_dummy_link_fix)
		mysqldump_SOURCES= mysqldump.c my_user.c \
		$(top_srcdir)/mysys/mf_getdate.c \
		$(yassl_dummy_link_fix)
		mysqlimport_SOURCES= mysqlimport.c $(yassl_dummy_link_fix)
		mysql_upgrade_SOURCES= mysql_upgrade.c $(yassl_dummy_link_fix)
		sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc
		strings_src=decimal.c

client/mysql.cc

+4 −1

Original line number	Diff line number	Diff line
		@@ -2884,7 +2884,7 @@ com_connect(String buffer, char line)
		bzero(buff, sizeof(buff));
		if (buffer)
		{
		strmov(buff, line);
		strmake(buff, line, sizeof(buff));
		tmp= get_arg(buff, 0);
		if (tmp && *tmp)
		{
		@@ -3738,6 +3738,9 @@ static const char* construct_prompt()
		case 't':
		processed_prompt.append('\t');
		break;
		case 'l':
		processed_prompt.append(delimiter_str);
		break;
		default:
		processed_prompt.append(c);
		}

client/mysqlbinlog.cc

+2 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@
		/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */
		#include "mysql_priv.h"
		#include "log_event.h"
		#include "sql_common.h"

		#define BIN_LOG_HEADER_SIZE 4
		#define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4)
		@@ -1104,7 +1105,7 @@ could be out of memory");
		const char *error_msg;
		Log_event *ev;

		len = net_safe_read(mysql);
		len= cli_safe_read(mysql);
		if (len == packet_error)
		{
		fprintf(stderr, "Got error reading packet from server: %s\n",

client/mysqlcheck.c

+12 −4

Original line number	Diff line number	Diff line
		@@ -475,7 +475,7 @@ static int process_all_tables_in_db(char *database)
		LINT_INIT(res);
		if (use_db(database))
		return 1;
		if (mysql_query(sock, "SHOW TABLES") \|\|
		if (mysql_query(sock, "SHOW TABLE STATUS") \|\|
		!((res= mysql_store_result(sock))))
		return 1;

		@@ -500,10 +500,14 @@ static int process_all_tables_in_db(char *database)
		return 1;
		}
		for (end = tables + 1; (row = mysql_fetch_row(res)) ;)
		{
		/* Skip tables with an engine of NULL (probably a view). */
		if (row[1])
		{
		end= fix_table_name(end, row[0]);
		*end++= ',';
		}
		}
		*--end = 0;
		if (tot_length)
		handle_request_for_tables(tables + 1, tot_length - 1);
		@@ -512,8 +516,12 @@ static int process_all_tables_in_db(char *database)
		else
		{
		while ((row = mysql_fetch_row(res)))
		/* Skip tables with an engine of NULL (probably a view). */
		if (row[1])
		{
		handle_request_for_tables(row[0], strlen(row[0]));
		}
		}
		mysql_free_result(res);
		return 0;
		} /* process_all_tables_in_db */