Merge bk-internal:/home/bk/mysql-5.1 (0463ba57) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysql.cc

+18 −2

Original line number	Diff line number	Diff line
		@@ -1269,12 +1269,12 @@ sig_handler handle_sigint(int sig)

		/* terminate if no query being executed, or we already tried interrupting */
		if (!executing_query \|\| interrupted_query)
		mysql_end(sig);
		goto err;

		kill_mysql= mysql_init(kill_mysql);
		if (!mysql_real_connect(kill_mysql,current_host, current_user, opt_password,
		"", opt_mysql_port, opt_mysql_unix_port,0))
		mysql_end(sig);
		goto err;

		/* kill_buffer is always big enough because max length of %lu is 15 */
		sprintf(kill_buffer, "KILL /!50000 QUERY / %lu", mysql_thread_id(&mysql));
		@@ -1283,6 +1283,22 @@ sig_handler handle_sigint(int sig)
		tee_fprintf(stdout, "Query aborted by Ctrl+C\n");

		interrupted_query= 1;

		return;

		err:
		#ifdef _WIN32
		/*
		When SIGINT is raised on Windows, the OS creates a new thread to handle the
		interrupt. Once that thread completes, the main thread continues running
		only to find that it's resources have already been free'd when the sigint
		handler called mysql_end().
		*/
		mysql_thread_end();
		return;
		#else
		mysql_end(sig);
		#endif
		}

+31 −0

Original line number	Diff line number	Diff line
		@@ -148,6 +148,37 @@ enum enum_server_command
		#define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)
		#define CLIENT_REMEMBER_OPTIONS (1UL << 31)

		/* Gather all possible capabilites (flags) supported by the server */
		#define CLIENT_ALL_FLAGS (CLIENT_LONG_PASSWORD \| \
		CLIENT_FOUND_ROWS \| \
		CLIENT_LONG_FLAG \| \
		CLIENT_CONNECT_WITH_DB \| \
		CLIENT_NO_SCHEMA \| \
		CLIENT_COMPRESS \| \
		CLIENT_ODBC \| \
		CLIENT_LOCAL_FILES \| \
		CLIENT_IGNORE_SPACE \| \
		CLIENT_PROTOCOL_41 \| \
		CLIENT_INTERACTIVE \| \
		CLIENT_SSL \| \
		CLIENT_IGNORE_SIGPIPE \| \
		CLIENT_TRANSACTIONS \| \
		CLIENT_RESERVED \| \
		CLIENT_SECURE_CONNECTION \| \
		CLIENT_MULTI_STATEMENTS \| \
		CLIENT_MULTI_RESULTS \| \
		CLIENT_SSL_VERIFY_SERVER_CERT \| \
		CLIENT_REMEMBER_OPTIONS)

		/*
		Switch off the flags that are optional and depending on build flags
		If any of the optional flags is supported by the build it will be switched
		on before sending to the client during the connection handshake.
		*/
		#define CLIENT_BASIC_FLAGS (((CLIENT_ALL_FLAGS & ~CLIENT_SSL) \
		& ~CLIENT_COMPRESS) \
		& ~CLIENT_SSL_VERIFY_SERVER_CERT)

		#define SERVER_STATUS_IN_TRANS 1 /* Transaction has started */
		#define SERVER_STATUS_AUTOCOMMIT 2 /* Server in auto_commit mode */
		#define SERVER_MORE_RESULTS_EXISTS 8 /* Multi query - next query exists */

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ SELECT * FROM t1 ORDER BY a;
		sync_slave_with_master;

		connection master;
		source include/show_binlog_events.inc;
		sync_slave_with_master;
		SELECT * FROM t1 ORDER BY a;
		connection master;

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,8 +9,10 @@ EXECUTE stmt1 USING @var1;
		show binlog events from <binlog_start>;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 # Query # # use `test`; CREATE TABLE t1(f1 blob)
		master-bin.000001 # Query # # use `test`; BEGIN
		master-bin.000001 # Table_map # # table_id: # (test.t1)
		master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
		master-bin.000001 # Query # # use `test`; COMMIT
		SELECT HEX(f1) FROM t1;
		HEX(f1)
		8300

+23 −0

Original line number	Diff line number	Diff line
		@@ -682,3 +682,26 @@ a a b
		1 1 3
		DROP TABLE t1;
		End of 5.0 tests
		CREATE TABLE t1(a INT, b INT, c INT, d INT, e INT,
		PRIMARY KEY(a,b,c,d,e),
		KEY(a,b,d,c)
		);
		INSERT INTO t1(a, b, c) VALUES (1, 1, 1),
		(1, 1, 2),
		(1, 1, 3),
		(1, 2, 1),
		(1, 2, 2),
		(1, 2, 3);
		EXPLAIN SELECT DISTINCT a, b, d, c FROM t1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 index NULL a 16 NULL 6 Using index
		SELECT DISTINCT a, b, d, c FROM t1;
		a b d c
		1 1 0 1
		1 1 0 2
		1 1 0 3
		1 2 0 1
		1 2 0 2
		1 2 0 3
		DROP TABLE t1;
		End of 5.1 tests