Merge bk-internal:/home/bk/mysql-5.0-maint (39d888cc) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+17 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		*.bb
		*.bbg
		*.bin
		*.cmake
		*.core
		*.d
		*.da
		@@ -17,6 +18,7 @@
		*.map
		*.o
		*.obj
		*.old
		*.pch
		*.pdb
		*.reject
		@@ -25,11 +27,21 @@
		*.so
		.so.
		*.spec
		*.user
		*.vcproj
		/.dir/*
		/_pure_*warnings
		*/.pure
		/debug/
		/release/
		*~
		.*.swp
		./CMakeCache.txt
		./MySql.ncb
		./MySql.sln
		./MySql.suo
		./README.build-files
		./cmakecache.txt
		./config.h
		./copy_mysql_files.bat
		./fix-project-files
		@@ -65,6 +77,7 @@ BitKeeper/post-commit-manual
		BitKeeper/tmp/*
		BitKeeper/tmp/bkr3sAHD
		BitKeeper/tmp/gone
		CMakeFiles/*
		COPYING
		COPYING.LIB
		Docs/#manual.texi#
		@@ -1195,6 +1208,7 @@ strings/ctype_autoconf.c
		strings/ctype_extra_sources.c
		strings/str_test
		strings/test_decimal
		support-files/*.ini
		support-files/MacOSX/Description.plist
		support-files/MacOSX/Info.plist
		support-files/MacOSX/ReadMe.txt
		@@ -1297,5 +1311,8 @@ vio/test-sslserver
		vio/viotest-ssl
		vio/viotest-sslconnect.cpp
		vio/viotest.cpp
		win/configure.data
		win/vs71cache.txt
		win/vs8cache.txt
		zlib/*.ds?
		zlib/*.vcproj

BitKeeper/triggers/post-commit

+15 −3

Original line number	Diff line number	Diff line
		@@ -6,6 +6,13 @@ COMMITS=commits@lists.mysql.com
		DOCS=docs-commit@mysql.com
		LIMIT=10000
		VERSION="5.0"
		BKROOT=`bk root`

		if [ -x /usr/sbin/sendmail ]; then
		SENDMAIL=/usr/sbin/sendmail
		else
		SENDMAIL=sendmail
		fi

		if [ "$REAL_EMAIL" = "" ]
		then
		@@ -58,7 +65,9 @@ $BH
		EOF
		bk changes -v -r+
		bk cset -r+ -d
		) \| /usr/sbin/sendmail -t
		) > $BKROOT/BitKeeper/tmp/dev_public.txt

		$SENDMAIL -t < $BKROOT/BitKeeper/tmp/dev_public.txt

		#++
		# commits@ mail
		@@ -82,7 +91,9 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
		EOF
		bk changes -v -r+
		bk cset -r+ -d
		) \| head -n $LIMIT \| /usr/sbin/sendmail -t
		) \| bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt

		$SENDMAIL -t < $BKROOT/BitKeeper/tmp/commits.txt

		#++
		# docs-commit@ mail
		@@ -102,7 +113,8 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS
		EOF
		bk changes -v -r+
		bk cset -r+ -d
		) \| /usr/sbin/sendmail -t
		) > $BKROOT/BitKeeper/tmp/docs.txt
		$SENDMAIL -t < $BKROOT/BitKeeper/tmp/docs.txt
		fi

		else

client/mysql.cc

+1 −5

Original line number	Diff line number	Diff line
		@@ -2321,10 +2321,8 @@ print_table_data(MYSQL_RES *result)
		MYSQL_ROW cur;
		MYSQL_FIELD *field;
		bool *num_flag;
		bool *not_null_flag;

		num_flag=(bool) my_alloca(sizeof(bool)mysql_num_fields(result));
		not_null_flag=(bool) my_alloca(sizeof(bool)mysql_num_fields(result));
		if (info_flag)
		{
		print_field_types(result);
		@@ -2363,7 +2361,6 @@ print_table_data(MYSQL_RES *result)
		MAX_COLUMN_LENGTH),
		field->name);
		num_flag[off]= IS_NUM(field->type);
		not_null_flag[off]= IS_NOT_NULL(field->flags);
		}
		(void) tee_fputs("\n", PAGER);
		tee_puts((char*) separator.ptr(), PAGER);
		@@ -2384,7 +2381,7 @@ print_table_data(MYSQL_RES *result)
		uint extra_padding;

		/* If this column may have a null value, use "NULL" for empty. */
		if (! not_null_flag[off] && (cur[off] == NULL))
		if (cur[off] == NULL)
		{
		buffer= "NULL";
		data_length= 4;
		@@ -2424,7 +2421,6 @@ print_table_data(MYSQL_RES *result)
		}
		tee_puts((char*) separator.ptr(), PAGER);
		my_afree((gptr) num_flag);
		my_afree((gptr) not_null_flag);
		}

client/mysql_upgrade.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -200,7 +200,7 @@ static int create_defaults_file(const char path, const char our_defaults_path)
		}
		buffer_end= strnmov(buffer, "\n[client]", sizeof(buffer));
		if (opt_password)
		buffer_end= strxnmov(buffer, sizeof(buffer),
		buffer_end= strxnmov(buffer_end, sizeof(buffer),
		"\npassword=", opt_password, NullS);
		error= my_write(defaults_file, buffer, (int) (buffer_end - buffer),
		MYF(MY_WME \| MY_FNABP));

client/mysqldump.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ static char *alloc_query_str(ulong size);
		static char field_escape(char to,const char *from,uint length);
		static my_bool verbose= 0, opt_no_create_info= 0, opt_no_data= 0,
		quick= 1, extended_insert= 1,
		lock_tables=1,ignore_errors=0,flush_logs=0,
		lock_tables=1,ignore_errors=0,flush_logs=0,flush_privileges=0,
		opt_drop=1,opt_keywords=0,opt_lock=1,opt_compress=0,
		opt_delayed=0,create_options=1,opt_quoted=0,opt_databases=0,
		opt_alldbs=0,opt_create_db=0,opt_lock_all_tables=0,
		@@ -256,6 +256,12 @@ static struct my_option my_long_options[] =
		"--lock-all-tables or --master-data with --flush-logs",
		(gptr) &flush_logs, (gptr) &flush_logs, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
		0, 0},
		{"flush-privileges", OPT_ESC, "Emit a FLUSH PRIVILEGES statement "
		"after dumping the mysql database. This option should be used any "
		"time the dump contains the mysql database and any other database "
		"that depends on the data in the mysql database for proper restore. ",
		(gptr) &flush_privileges, (gptr) &flush_privileges, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
		0, 0},
		{"force", 'f', "Continue even if we get an sql-error.",
		(gptr) &ignore_errors, (gptr) &ignore_errors, 0, GET_BOOL, NO_ARG,
		0, 0, 0, 0, 0, 0},
		@@ -2767,6 +2773,7 @@ static int dump_all_tables_in_db(char *database)

		char hash_key[2NAME_LEN+2]; / "db.tablename" */
		char *afterdot;
		int using_mysql_db= my_strcasecmp(&my_charset_latin1, database, "mysql");

		afterdot= strmov(hash_key, database);
		*afterdot++= '.';
		@@ -2821,6 +2828,11 @@ static int dump_all_tables_in_db(char *database)
		}
		if (lock_tables)
		VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
		if (flush_privileges && using_mysql_db == 0)
		{
		fprintf(md_result_file,"\n--\n-- Flush Grant Tables \n--\n");
		fprintf(md_result_file,"\n/! FLUSH PRIVILEGES /;\n");
		}
		return 0;
		} /* dump_all_tables_in_db */