Integrated table->ref_primary_key into table->part_of_key (5a14bb2a) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqlbinlog.cc

+3 −2

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ static void dump_remote_log_entries(const char* logname)

		for(;;)
		{
		const char *error;
		len = net_safe_read(mysql);
		if (len == packet_error)
		die("Error reading packet from server: %s", mysql_error(mysql));
		@@ -330,7 +331,7 @@ static void dump_remote_log_entries(const char* logname)
		len, net->read_pos[5]));
		Log_event * ev = Log_event::read_log_event(
		(const char*) net->read_pos + 1 ,
		len - 1);
		len - 1, &error);
		if (ev)
		{
		ev->print(result_file, short_form, last_db);

+1 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ int heap_write(HP_INFO info, const byte record)
		info->update\|=HA_STATE_AKTIV;
		DBUG_RETURN(0);
		err:
		DBUG_PRINT("info",("Duplicate key: %d",key));
		info->errkey= key;
		do
		{

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ static void usage(void)
		-?, --help Display this help and exit.\n\
		-V, --version Output version information and exit.");
		print_defaults("my",load_default_groups);
		};
		}

		/* reads options */
		/* Initiates DEBUG - but no debugging here ! */

+6 −5

Original line number	Diff line number	Diff line
		@@ -269,8 +269,7 @@ DASH72=`$ECHO '-----------------------------------------------------------------
		# on binary, use what is installed
		if [ x$SOURCE_DIST = x1 ] ; then
		MYSQLD="$BASEDIR/sql/mysqld"
		if [ -e "$BASEDIR/client/.libs/mysqltest" ] ; then
		[ -e "$BASEDIR/client/.libs/lt-mysqltest" ] \|\| $BASEDIR/client/mysqltest -V
		if [ -f "$BASEDIR/client/.libs/lt-mysqltest" ] ; then
		MYSQL_TEST="$BASEDIR/client/.libs/lt-mysqltest"
		else
		MYSQL_TEST="$BASEDIR/client/mysqltest"
		@@ -502,7 +501,7 @@ start_master()
		#start master
		if [ -z "$DO_BENCH" ]
		then
		master_args="--no-defaults --log-bin=master-bin \
		master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \
		--server-id=1 \
		--basedir=$MY_BASEDIR \
		--port=$MASTER_MYPORT \
		@@ -519,7 +518,8 @@ start_master()
		$SMALL_SERVER \
		$EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
		else
		master_args="--no-defaults --log-bin=master-bin --server-id=1 \
		master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \
		--server-id=1 \
		--basedir=$MY_BASEDIR \
		--port=$MASTER_MYPORT \
		--datadir=$MASTER_MYDDIR \
		@@ -576,7 +576,8 @@ start_slave()
		$RM -f $SLAVE_MYDDIR/log.*
		slave_args="--no-defaults $master_info \
		--exit-info=256 \
		--log-bin=slave-bin --log-slave-updates \
		--log-bin=$MYSQL_TEST_DIR/var/log/slave-bin
		--log-slave-updates \
		--basedir=$MY_BASEDIR \
		--datadir=$SLAVE_MYDDIR \
		--pid-file=$SLAVE_MYPID \

+12 −0