Merge mskold@build.mysql.com:/home/bk/mysql-4.1 (ed7d4eeb) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+93 −94

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ Docs/mysql.xml
		Docs/safe-mysql.xml
		Docs/tex.fmt
		Docs/texi2dvi.out
		EXCEPTIONS-CLIENT
		INSTALL-SOURCE
		INSTALL-WIN-SOURCE
		Logs/*
		@@ -272,11 +273,13 @@ emacs.h
		extra/comp_err
		extra/my_print_defaults
		extra/mysql_install
		extra/mysql_tzinfo_to_sql
		extra/mysql_waitpid
		extra/perror
		extra/replace
		extra/resolve_stack_dump
		extra/resolveip
		extra/tztime.cc
		fcns.c
		fcns.h
		gmon.out
		@@ -316,6 +319,7 @@ isam/test3
		libmysql/*.c
		libmysql/conf_to_src
		libmysql/my_static.h
		libmysql/my_time.c
		libmysql/mysys_priv.h
		libmysql/net.c
		libmysql/vio_priv.h
		@@ -382,6 +386,7 @@ libmysqld/log_event.cc
		libmysqld/md5.c
		libmysqld/mf_iocache.cc
		libmysqld/mini_client.cc
		libmysqld/my_time.c
		libmysqld/net_pkg.cc
		libmysqld/net_serv.cc
		libmysqld/opt_ft.cc
		@@ -644,7 +649,71 @@ ndb/lib/libREP_API.so
		ndb/lib/libndbclient.so
		ndb/lib/libndbclient_extra.so
		ndb/src/common/mgmcommon/printConfig/*.d
		ndb/src/cw/cpcd/ndb_cpcd
		ndb/src/kernel/blocks/backup/restore/ndb_restore
		ndb/src/kernel/ndbd
		ndb/src/mgmclient/ndb_mgm
		ndb/src/mgmclient/test_cpcd/*.d
		ndb/src/mgmsrv/ndb_mgmd
		ndb/test/ndbapi/bank/bankCreator
		ndb/test/ndbapi/bank/bankMakeGL
		ndb/test/ndbapi/bank/bankSumAccounts
		ndb/test/ndbapi/bank/bankTimer
		ndb/test/ndbapi/bank/bankTransactionMaker
		ndb/test/ndbapi/bank/bankValidateAllGLs
		ndb/test/ndbapi/bank/testBank
		ndb/test/ndbapi/create_all_tabs
		ndb/test/ndbapi/create_tab
		ndb/test/ndbapi/drop_all_tabs
		ndb/test/ndbapi/flexAsynch
		ndb/test/ndbapi/flexBench
		ndb/test/ndbapi/flexHammer
		ndb/test/ndbapi/flexTT
		ndb/test/ndbapi/testBackup
		ndb/test/ndbapi/testBasic
		ndb/test/ndbapi/testBasicAsynch
		ndb/test/ndbapi/testBlobs
		ndb/test/ndbapi/testDataBuffers
		ndb/test/ndbapi/testDeadlock
		ndb/test/ndbapi/testDict
		ndb/test/ndbapi/testIndex
		ndb/test/ndbapi/testMgm
		ndb/test/ndbapi/testNdbApi
		ndb/test/ndbapi/testNodeRestart
		ndb/test/ndbapi/testOIBasic
		ndb/test/ndbapi/testOperations
		ndb/test/ndbapi/testRestartGci
		ndb/test/ndbapi/testScan
		ndb/test/ndbapi/testScanInterpreter
		ndb/test/ndbapi/testScanPerf
		ndb/test/ndbapi/testSystemRestart
		ndb/test/ndbapi/testTimeout
		ndb/test/ndbapi/testTransactions
		ndb/test/ndbapi/test_event
		ndb/test/run-test/atrt
		ndb/test/tools/copy_tab
		ndb/test/tools/create_index
		ndb/test/tools/hugoCalculator
		ndb/test/tools/hugoFill
		ndb/test/tools/hugoLoad
		ndb/test/tools/hugoLockRecords
		ndb/test/tools/hugoPkDelete
		ndb/test/tools/hugoPkRead
		ndb/test/tools/hugoPkReadRecord
		ndb/test/tools/hugoPkUpdate
		ndb/test/tools/hugoScanRead
		ndb/test/tools/hugoScanUpdate
		ndb/test/tools/ndb_cpcc
		ndb/test/tools/restart
		ndb/test/tools/verify_index
		ndb/tools/ndb_delete_all
		ndb/tools/ndb_desc
		ndb/tools/ndb_drop_index
		ndb/tools/ndb_drop_table
		ndb/tools/ndb_select_all
		ndb/tools/ndb_select_count
		ndb/tools/ndb_show_tables
		ndb/tools/ndb_waiter
		pull.log
		regex/re
		repl-tests/test-repl-ts/repl-timestamp.master.reject
		@@ -715,7 +784,10 @@ sql/gen_lex_hash
		sql/gmon.out
		sql/lex_hash.h
		sql/mini_client_errors.c
		sql/my_time.c
		sql/mysql_tzinfo_to_sql
		sql/mysql_tzinfo_to_sql.cc
		sql/mysql_tzinfo_to_sql_tztime.cc
		sql/mysqlbinlog
		sql/mysqld
		sql/mysqld-purecov
		@@ -770,41 +842,13 @@ support-files/mysql-log-rotate
		support-files/mysql.server
		support-files/mysql.spec
		tags
		test_xml
		tests/client_test
		tests/connect_test
		thread_test
		tmp/*
		tools/my_vsnprintf.c
		tools/mysqlmanager
		tools/mysqlmngd
		tools/mysys_priv.h
		vi.h
		vio/test-ssl
		vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl
		extra/tztime.cc
		extra/mysql_tzinfo_to_sql
		sql/mysql_tzinfo_to_sql_tztime.cc
		sql/my_time.c
		libmysql/my_time.c
		libmysqld/my_time.c
		sql/mysql_tzinfo_to_sql
		sql/mysql_tzinfo_to_sql.cc
		ndb/src/cw/cpcd/ndb_cpcd
		ndb/src/kernel/ndbd
		ndb/src/kernel/blocks/backup/restore/ndb_restore
		ndb/src/mgmclient/ndb_mgm
		ndb/src/mgmsrv/ndb_mgmd
		ndb/tools/ndb_delete_all
		ndb/tools/ndb_desc
		ndb/tools/ndb_drop_index
		ndb/tools/ndb_drop_table
		ndb/tools/ndb_select_all
		ndb/tools/ndb_select_count
		ndb/tools/ndb_show_tables
		ndb/tools/ndb_waiter
		test/ndbapi/bank/bankCreator
		test/ndbapi/bank/bankMakeGL
		test/ndbapi/bank/bankSumAccounts
		test/ndbapi/bank/bankTimer
		test/ndbapi/bank/bankTransactionMaker
		test/ndbapi/bank/bankValidateAllGLs
		test/ndbapi/bank/testBank
		test/ndbapi/create_all_tabs
		test/ndbapi/create_tab
		test/ndbapi/drop_all_tabs
		@@ -833,13 +877,6 @@ test/ndbapi/testSystemRestart
		test/ndbapi/testTimeout
		test/ndbapi/testTransactions
		test/ndbapi/test_event
		test/ndbapi/bank/bankCreator
		test/ndbapi/bank/bankMakeGL
		test/ndbapi/bank/bankSumAccounts
		test/ndbapi/bank/bankTimer
		test/ndbapi/bank/bankTransactionMaker
		test/ndbapi/bank/bankValidateAllGLs
		test/ndbapi/bank/testBank
		test/run-test/atrt
		test/tools/copy_tab
		test/tools/create_index
		@@ -856,55 +893,17 @@ test/tools/hugoScanUpdate
		test/tools/ndb_cpcc
		test/tools/restart
		test/tools/verify_index
		ndb/test/ndbapi/create_all_tabs
		ndb/test/ndbapi/create_tab
		ndb/test/ndbapi/drop_all_tabs
		ndb/test/ndbapi/flexAsynch
		ndb/test/ndbapi/flexBench
		ndb/test/ndbapi/flexHammer
		ndb/test/ndbapi/flexTT
		ndb/test/ndbapi/testBackup
		ndb/test/ndbapi/testBasic
		ndb/test/ndbapi/testBasicAsynch
		ndb/test/ndbapi/testBlobs
		ndb/test/ndbapi/testDataBuffers
		ndb/test/ndbapi/testDeadlock
		ndb/test/ndbapi/testDict
		ndb/test/ndbapi/testIndex
		ndb/test/ndbapi/testMgm
		ndb/test/ndbapi/testNdbApi
		ndb/test/ndbapi/testNodeRestart
		ndb/test/ndbapi/testOIBasic
		ndb/test/ndbapi/testOperations
		ndb/test/ndbapi/testRestartGci
		ndb/test/ndbapi/testScan
		ndb/test/ndbapi/testScanInterpreter
		ndb/test/ndbapi/testScanPerf
		ndb/test/ndbapi/testSystemRestart
		ndb/test/ndbapi/testTimeout
		ndb/test/ndbapi/testTransactions
		ndb/test/ndbapi/test_event
		ndb/test/ndbapi/bank/bankCreator
		ndb/test/ndbapi/bank/bankMakeGL
		ndb/test/ndbapi/bank/bankSumAccounts
		ndb/test/ndbapi/bank/bankTimer
		ndb/test/ndbapi/bank/bankTransactionMaker
		ndb/test/ndbapi/bank/bankValidateAllGLs
		ndb/test/ndbapi/bank/testBank
		ndb/test/run-test/atrt
		ndb/test/tools/copy_tab
		ndb/test/tools/create_index
		ndb/test/tools/hugoCalculator
		ndb/test/tools/hugoFill
		ndb/test/tools/hugoLoad
		ndb/test/tools/hugoLockRecords
		ndb/test/tools/hugoPkDelete
		ndb/test/tools/hugoPkRead
		ndb/test/tools/hugoPkReadRecord
		ndb/test/tools/hugoPkUpdate
		ndb/test/tools/hugoScanRead
		ndb/test/tools/hugoScanUpdate
		ndb/test/tools/ndb_cpcc
		ndb/test/tools/restart
		ndb/test/tools/verify_index
		EXCEPTIONS-CLIENT
		test_xml
		tests/client_test
		tests/connect_test
		thread_test
		tmp/*
		tools/my_vsnprintf.c
		tools/mysqlmanager
		tools/mysqlmngd
		tools/mysys_priv.h
		vi.h
		vio/test-ssl
		vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl

cmd-line-utils/libedit/history.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -649,7 +649,7 @@ history_save(History h, const char fname)
		retval = HPREV(h, &ev), i++) {
		len = strlen(ev.str) * 4;
		if (len >= max_size) {
		max_size = (len + 1023) & 1023;
		max_size = (len + 1023) & ~1023;
		ptr = h_realloc(ptr, max_size);
		}
		(void) strvis(ptr, ev.str, VIS_WHITE);

include/my_global.h

+9 −21

Original line number	Diff line number	Diff line
		@@ -644,29 +644,17 @@ typedef SOCKET_SIZE_TYPE size_socket;
		#endif
		#endif /* defined (HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)*/

		#if SIZEOF_LONG == 4
		#define INT_MIN32 ((long) 0x80000000L)
		#define INT_MAX32 ((long) 0x7FFFFFFFL)
		#define UINT_MAX32 ((long) 0xFFFFFFFFL)
		#define INT_MIN24 ((long) 0xFF800000L)
		#define INT_MAX24 0x007FFFFFL
		#define UINT_MAX24 0x00FFFFFFL
		#define INT_MIN16 ((short int) 0x8000)
		#define INT_MIN32 (~0x7FFFFFFFL)
		#define INT_MAX32 0x7FFFFFFFL
		#define UINT_MAX32 0xFFFFFFFFL
		#define INT_MIN24 (~0x007FFFFF)
		#define INT_MAX24 0x007FFFFF
		#define UINT_MAX24 0x00FFFFFF
		#define INT_MIN16 (~0x7FFF)
		#define INT_MAX16 0x7FFF
		#define UINT_MAX16 0xFFFF
		#define INT_MIN8 ((char) 0x80)
		#define INT_MAX8 ((char) 0x7F)
		#else /* Probably Alpha */
		#define INT_MIN32 ((long) (int) 0x80000000)
		#define INT_MAX32 ((long) (int) 0x7FFFFFFF)
		#define UINT_MAX32 ((long) (int) 0xFFFFFFFF)
		#define INT_MIN24 ((long) (int) 0xFF800000)
		#define INT_MAX24 ((long) (int) 0x007FFFFF)
		#define UINT_MAX24 ((long) (int) 0x00FFFFFF)
		#define INT_MIN16 ((short int) 0xFFFF8000)
		#define INT_MAX16 ((short int) 0x00007FFF)
		#define UINT_MAX16 ((short int) 0x0000FFFF)
		#endif
		#define INT_MIN8 (~0x7F)
		#define INT_MAX8 0x7F

		/* From limits.h instead */
		#ifndef DBL_MIN

mysql-test/r/rpl_heap.result

+6 −6

Original line number	Diff line number	Diff line
		reset master;
		drop table if exists t1;
		create table t1 (a int) type=HEAP;
		insert into t1 values(10);
		create table t1 type=HEAP select 10 as a;
		insert into t1 values(11);
		show binlog events from 79;
		Log_name Pos Event_type Server_id Orig_log_pos Info
		master-bin.001 79 Query 1 79 use `test`; create table t1 (a int) type=HEAP
		master-bin.001 147 Query 1 147 use `test`; DELETE FROM `test`.`t1`
		master-bin.001 205 Query 1 205 use `test`; insert into t1 values(10)
		master-bin.001 79 Query 1 79 use `test`; create table t1 type=HEAP select 10 as a
		master-bin.001 154 Query 1 154 use `test`; insert into t1 values(11)
		reset slave;
		start slave;
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` int(11) default NULL
		`a` bigint(2) NOT NULL default '0'
		) TYPE=HEAP
		select * from t1;
		a
		10
		11
		select * from t1;
		a
		select * from t1 limit 10;

mysql-test/r/subselect.result

+13 −0

Original line number	Diff line number	Diff line
		@@ -1899,3 +1899,16 @@ select t000.a, count() `C` FROM t1 t000 GROUP BY t000.a HAVING count() > ALL (
		a C
		1 1
		drop table t1,t2;
		create table t1 (a int not null auto_increment primary key, b varchar(40), fulltext(b));
		insert into t1 (b) values ('ball'),('ball games'), ('games'), ('foo'), ('foobar'), ('Serg'), ('Sergei'),('Georg'), ('Patrik'),('Hakan');
		create table t2 (a int);
		insert into t2 values (1),(3),(2),(7);
		select a,b from t1 where match(b) against ('Ball') > 0;
		a b
		1 ball
		2 ball games
		select a from t2 where a in (select a from t1 where match(b) against ('Ball') > 0);
		a
		1
		2
		drop table t1,t2;