Merge bk-internal:/home/bk/mysql-5.0 (7a91fb5d) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -754,6 +754,7 @@ ndb/examples/ndbapi_example3/ndbapi_example3
		ndb/examples/ndbapi_example5/ndbapi_example5
		ndb/examples/select_all/select_all
		ndb/include/ndb_global.h
		ndb/include/ndb_types.h
		ndb/include/ndb_version.h
		ndb/lib/libMGM_API.so
		ndb/lib/libNDB_API.so

BUILD/compile-solaris-sparc-purify

+11 −12

Original line number	Diff line number	Diff line
		@@ -4,10 +4,10 @@ while test $# -gt 0
		do
		case "$1" in
		--debug) EXTRA_CONFIG_FLAGS=--with-debug; shift ;;
		-h \| --help ) cat <<EOF; exit 0 ;;
		Usage: $0 [-h\|-n] [configure-options]
		--debug Compile with DBUG enabled
		EOF
		-h \| --help )
		echo "Usage: $0 [-h\|-n] [configure-options]"
		echo " --debug Compile with DBUG enabled"
		exit 0 ;;
		*) echo "No such option '$1'" ; exit ;;
		esac
		done
		@@ -15,16 +15,15 @@ done
		gmake -k clean \|\| true
		/bin/rm -f /.deps/.P config.cache
		aclocal && autoheader && aclocal && automake && autoconf
		(cd bdb/dist && sh s_all)
		# (cd bdb/dist && sh s_all)
		(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)

		CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-innodb $EXTRA_CONFIG_FLAGS
		CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --without-berkeley-db --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS

		gmake -j 4

		cd sql ; mv mysqld mysqld-org ;
		make CXXLD="purify -best-effort g++" mysqld ; mv mysqld mysqld-purify
		make CXXLD="quantify -best-effort g++" mysqld ; mv mysqld mysqld-quantify
		make CXXLD="purecov -best-effort g++" mysqld ; mv mysqld mysqld-purecov
		gmake CXXLD="purify -best-effort g++" mysqld ; mv mysqld mysqld-purify
		gmake CXXLD="quantify -best-effort g++" mysqld ; mv mysqld mysqld-quantify
		gmake CXXLD="purecov -best-effort g++" mysqld ; mv mysqld mysqld-purecov
		mv mysqld-org mysqld

Build-tools/Do-compile

+2 −1

Original line number	Diff line number	Diff line
		@@ -266,6 +266,7 @@ if ($opt_stage <= 1)
		$opt_config_options.= " --with-zlib-dir=bundled" if ($opt_bundled_zlib);
		$opt_config_options.= " --with-client-ldflags=-all-static" if ($opt_static_client);
		$opt_config_options.= " --with-debug" if ($opt_with_debug);
		$opt_config_options.= " --without-ndb-debug" if ($opt_with_debug && $opt_with_cluster);
		$opt_config_options.= " --with-libwrap" if ($opt_libwrap);
		$opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);
		$opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);

client/mysqladmin.cc

+17 −8

Original line number	Diff line number	Diff line
		@@ -833,7 +833,8 @@ static int execute_commands(MYSQL mysql,int argc, char *argv)
		if (argv[1][0])
		{
		char *pw= argv[1];
		bool old= find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD;
		bool old= (find_type(argv[0], &command_typelib, 2) ==
		ADMIN_OLD_PASSWORD);
		#ifdef __WIN__
		uint pw_len= strlen(pw);
		if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'')
		@@ -844,21 +845,29 @@ static int execute_commands(MYSQL mysql,int argc, char *argv)
		If we don't already know to use an old-style password, see what
		the server is using
		*/
		if (!old) {
		if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'")) {
		if (!old)
		{
		if (mysql_query(mysql, "SHOW VARIABLES LIKE 'old_passwords'"))
		{
		my_printf_error(0, "Could not determine old_passwords setting from server; error: '%s'",
		MYF(ME_BELL),mysql_error(mysql));
		return -1;
		} else {
		}
		else
		{
		MYSQL_RES *res= mysql_store_result(mysql);
		if (!res) {
		my_printf_error(0, "Could not get old_passwords setting from server; error: '%s'",
		if (!res)
		{
		my_printf_error(0,
		"Could not get old_passwords setting from "
		"server; error: '%s'",
		MYF(ME_BELL),mysql_error(mysql));
		return -1;
		}
		if (!mysql_num_rows(res)) {
		if (!mysql_num_rows(res))
		old= 1;
		} else {
		else
		{
		MYSQL_ROW row= mysql_fetch_row(res);
		old= !strncmp(row[1], "ON", 2);
		}

heap/hp_create.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ int heap_create(const char name, uint keys, HP_KEYDEF keydef,
		}
		share->min_records= min_records;
		share->max_records= max_records;
		share->max_table_size= create_info->max_table_size;
		share->data_length= share->index_length= 0;
		share->reclength= reclength;
		share->blength= 1;