Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ (da244cc9) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+50 −51

Original line number	Diff line number	Diff line
		@@ -361,8 +361,11 @@ libmysqld/examples/link_sources
		libmysqld/examples/my_readline.h
		libmysqld/examples/mysql
		libmysqld/examples/mysql.cc
		libmysqld/examples/mysql_client_test.c
		libmysqld/examples/mysql_client_test_embedded
		libmysqld/examples/mysqltest
		libmysqld/examples/mysqltest.c
		libmysqld/examples/mysqltest_embedded
		libmysqld/examples/readline.cc
		libmysqld/examples/sql_string.cc
		libmysqld/examples/sql_string.h
		@@ -727,13 +730,45 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so
		ndb/lib/libREP_API.so
		ndb/lib/libndbclient.so
		ndb/lib/libndbclient_extra.so
		ndb/src/common/debugger/libtrace.dsp
		ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
		ndb/src/common/logger/liblogger.dsp
		ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
		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/cw/cpcd/ndb_cpcd
		ndb/src/kernel/blocks/backup/libbackup.dsp
		ndb/src/kernel/blocks/backup/restore/ndb_restore
		ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
		ndb/src/kernel/blocks/dbacc/libdbacc.dsp
		ndb/src/kernel/blocks/dbdict/libdbdict.dsp
		ndb/src/kernel/blocks/dbdih/libdbdih.dsp
		ndb/src/kernel/blocks/dblqh/libdblqh.dsp
		ndb/src/kernel/blocks/dbtc/libdbtc.dsp
		ndb/src/kernel/blocks/dbtup/libdbtup.dsp
		ndb/src/kernel/blocks/dbtux/libdbtux.dsp
		ndb/src/kernel/blocks/dbutil/libdbutil.dsp
		ndb/src/kernel/blocks/grep/libgrep.dsp
		ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
		ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
		ndb/src/kernel/blocks/qmgr/libqmgr.dsp
		ndb/src/kernel/blocks/suma/libsuma.dsp
		ndb/src/kernel/blocks/trix/libtrix.dsp
		ndb/src/kernel/error/liberror.dsp
		ndb/src/kernel/ndbd
		ndb/src/kernel/ndbd.dsp
		ndb/src/kernel/vm/libkernel.dsp
		ndb/src/libndbclient.dsp
		ndb/src/mgmapi/libmgmapi.dsp
		ndb/src/mgmclient/libndbmgmclient.dsp
		ndb/src/mgmclient/ndb_mgm
		ndb/src/mgmclient/ndb_mgm.dsp
		ndb/src/mgmclient/test_cpcd/*.d
		ndb/src/mgmsrv/ndb_mgmd
		ndb/src/mgmsrv/ndb_mgmd.dsp
		ndb/src/ndbapi/libndbapi.dsp
		ndb/test/ndbapi/bank/bankCreator
		ndb/test/ndbapi/bank/bankMakeGL
		ndb/test/ndbapi/bank/bankSumAccounts
		@@ -746,12 +781,15 @@ ndb/test/ndbapi/create_tab
		ndb/test/ndbapi/drop_all_tabs
		ndb/test/ndbapi/flexAsynch
		ndb/test/ndbapi/flexBench
		ndb/test/ndbapi/flexBench.dsp
		ndb/test/ndbapi/flexHammer
		ndb/test/ndbapi/flexTT
		ndb/test/ndbapi/testBackup
		ndb/test/ndbapi/testBasic
		ndb/test/ndbapi/testBasic.dsp
		ndb/test/ndbapi/testBasicAsynch
		ndb/test/ndbapi/testBlobs
		ndb/test/ndbapi/testBlobs.dsp
		ndb/test/ndbapi/testDataBuffers
		ndb/test/ndbapi/testDeadlock
		ndb/test/ndbapi/testDict
		@@ -763,6 +801,7 @@ ndb/test/ndbapi/testOIBasic
		ndb/test/ndbapi/testOperations
		ndb/test/ndbapi/testRestartGci
		ndb/test/ndbapi/testScan
		ndb/test/ndbapi/testScan.dsp
		ndb/test/ndbapi/testScanInterpreter
		ndb/test/ndbapi/testScanPerf
		ndb/test/ndbapi/testSystemRestart
		@@ -770,6 +809,7 @@ ndb/test/ndbapi/testTimeout
		ndb/test/ndbapi/testTransactions
		ndb/test/ndbapi/test_event
		ndb/test/run-test/atrt
		ndb/test/src/libNDBT.dsp
		ndb/test/tools/copy_tab
		ndb/test/tools/create_index
		ndb/test/tools/hugoCalculator
		@@ -786,15 +826,23 @@ ndb/test/tools/ndb_cpcc
		ndb/test/tools/restart
		ndb/test/tools/verify_index
		ndb/tools/ndb_delete_all
		ndb/tools/ndb_delete_all.dsp
		ndb/tools/ndb_desc
		ndb/tools/ndb_desc.dsp
		ndb/tools/ndb_drop_index
		ndb/tools/ndb_drop_index.dsp
		ndb/tools/ndb_drop_table
		ndb/tools/ndb_drop_table.dsp
		ndb/tools/ndb_restore
		ndb/tools/ndb_select_all
		ndb/tools/ndb_select_all.dsp
		ndb/tools/ndb_select_count
		ndb/tools/ndb_select_count.dsp
		ndb/tools/ndb_show_tables
		ndb/tools/ndb_show_tables.dsp
		ndb/tools/ndb_test_platform
		ndb/tools/ndb_waiter
		ndb/tools/ndb_waiter.dsp
		ndbcluster-1186
		ndbcluster-1186/SCCS
		ndbcluster-1186/config.ini
		@@ -936,6 +984,7 @@ support-files/mysql-3.23.29-gamma.spec
		support-files/mysql-log-rotate
		support-files/mysql.server
		support-files/mysql.spec
		support-files/ndb-config-2-node.ini
		tags
		test/ndbapi/bank/bankCreator
		test/ndbapi/bank/bankMakeGL
		@@ -991,6 +1040,7 @@ test/tools/verify_index
		test_xml
		tests/client_test
		tests/connect_test
		tests/mysql_client_test
		thread_test
		tmp/*
		tools/my_vsnprintf.c
		@@ -1002,54 +1052,3 @@ vio/test-ssl
		vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl
		tests/mysql_client_test
		tests/mysql_client_test
		libmysqld/examples/mysql_client_test.c
		libmysqld/examples/mysql_client_test_embedded
		libmysqld/examples/mysqltest_embedded
		ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
		ndb/src/common/debugger/libtrace.dsp
		ndb/src/common/logger/liblogger.dsp
		ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
		ndb/src/common/portlib/libportlib.dsp
		ndb/src/common/transporter/libtransporter.dsp
		ndb/src/common/util/libgeneral.dsp
		ndb/src/kernel/blocks/backup/libbackup.dsp
		ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
		ndb/src/kernel/blocks/dbacc/libdbacc.dsp
		ndb/src/kernel/blocks/dbdict/libdbdict.dsp
		ndb/src/kernel/blocks/dbdih/libdbdih.dsp
		ndb/src/kernel/blocks/dblqh/libdblqh.dsp
		ndb/src/kernel/blocks/dbtc/libdbtc.dsp
		ndb/src/kernel/blocks/dbtup/libdbtup.dsp
		ndb/src/kernel/blocks/dbtux/libdbtux.dsp
		ndb/src/kernel/blocks/dbutil/libdbutil.dsp
		ndb/src/kernel/blocks/grep/libgrep.dsp
		ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
		ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
		ndb/src/kernel/blocks/qmgr/libqmgr.dsp
		ndb/src/kernel/blocks/suma/libsuma.dsp
		ndb/src/kernel/blocks/trix/libtrix.dsp
		ndb/src/kernel/error/liberror.dsp
		ndb/src/kernel/vm/libkernel.dsp
		ndb/src/kernel/ndbd.dsp
		ndb/src/mgmapi/libmgmapi.dsp
		ndb/src/mgmclient/ndb_mgm.dsp
		ndb/src/mgmclient/libndbmgmclient.dsp
		ndb/src/mgmsrv/ndb_mgmd.dsp
		ndb/src/ndbapi/libndbapi.dsp
		ndb/src/libndbclient.dsp
		ndb/test/ndbapi/flexBench.dsp
		ndb/test/ndbapi/testBasic.dsp
		ndb/test/ndbapi/testBlobs.dsp
		ndb/test/ndbapi/testScan.dsp
		ndb/test/src/libNDBT.dsp
		ndb/tools/ndb_waiter.dsp
		ndb/tools/ndb_drop_table.dsp
		ndb/tools/ndb_delete_all.dsp
		ndb/tools/ndb_desc.dsp
		ndb/tools/ndb_drop_index.dsp
		ndb/tools/ndb_show_tables.dsp
		ndb/tools/ndb_select_all.dsp
		ndb/tools/ndb_select_count.dsp
		support-files/ndb-config-2-node.ini

client/mysqldump.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1790,7 +1790,7 @@ static void dumpTable(uint numFields, char *table)
		char ptr= row[i], end= ptr+ lengths[i];
		fputs("0x", md_result_file);
		for (; ptr < end ; ptr++)
		fprintf(md_result_file, "%02X", *ptr);
		fprintf(md_result_file, "%02X", ((uchar )ptr));
		}
		else
		unescape(md_result_file, row[i], lengths[i]);

mysql-test/r/mysqldump.result

+46 −0

Original line number	Diff line number	Diff line
		@@ -528,3 +528,49 @@ UNLOCK TABLES;

		DROP TABLE t1;
		DROP TABLE t2;
		CREATE TABLE t1 (`b` blob);
		INSERT INTO `t1` VALUES (0x602010000280100005E71A);
		-- MySQL dump 10.9
		--
		-- Host: localhost Database: test
		-- ------------------------------------------------------
		-- Server version 4.1.11-debug-log

		/!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT /;
		/!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS /;
		/!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION /;
		/!40101 SET NAMES utf8 /;
		/!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 /;
		/!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 /;
		/!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' /;
		/!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 /;

		--
		-- Table structure for table `t1`
		--

		DROP TABLE IF EXISTS `t1`;
		CREATE TABLE `t1` (
		`b` blob
		) ENGINE=MyISAM DEFAULT CHARSET=latin1;

		--
		-- Dumping data for table `t1`
		--


		/!40000 ALTER TABLE `t1` DISABLE KEYS /;
		LOCK TABLES `t1` WRITE;
		INSERT INTO `t1` VALUES (0x602010000280100005E71A);
		UNLOCK TABLES;
		/!40000 ALTER TABLE `t1` ENABLE KEYS /;

		/!40101 SET SQL_MODE=@OLD_SQL_MODE /;
		/!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS /;
		/!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS /;
		/!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT /;
		/!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS /;
		/!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION /;
		/!40111 SET SQL_NOTES=@OLD_SQL_NOTES /;

		DROP TABLE t1;

mysql-test/t/mysqldump.test

+10 −0

Original line number	Diff line number	Diff line
		@@ -172,3 +172,13 @@ INSERT INTO t2 VALUES (4),(5),(6);
		--exec $MYSQL_DUMP --skip-comments --ignore-table=test.t1 test
		DROP TABLE t1;
		DROP TABLE t2;

		#
		# Bug #8830
		#

		CREATE TABLE t1 (`b` blob);
		INSERT INTO `t1` VALUES (0x602010000280100005E71A);
		--exec $MYSQL_DUMP --skip-extended-insert --hex-blob test t1
		DROP TABLE t1;