Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql (545f6161) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+16 −15

Original line number	Diff line number	Diff line
		@@ -221,6 +221,7 @@ libmysql/*.c
		libmysql/conf_to_src
		libmysql/my_static.h
		libmysql/mysys_priv.h
		libmysql/net.c
		libmysql_r/*.c
		libmysql_r/acconfig.h
		libmysql_r/conf_to_src
		@@ -302,6 +303,7 @@ libmysqld/sql_list.cc
		libmysqld/sql_load.cc
		libmysqld/sql_manager.cc
		libmysqld/sql_map.cc
		libmysqld/sql_olap.cc
		libmysqld/sql_parse.cc
		libmysqld/sql_rename.cc
		libmysqld/sql_repl.cc
		@@ -332,6 +334,13 @@ linked_server_sources
		linked_tools_sources
		locked
		mit-pthreads/config.flags
		mit-pthreads/include/bits
		mit-pthreads/include/pthread/machdep.h
		mit-pthreads/include/pthread/posix.h
		mit-pthreads/include/sys
		mit-pthreads/machdep.c
		mit-pthreads/pg++
		mit-pthreads/pgcc
		mit-pthreads/syscall.S
		myisam/FT1.MYD
		myisam/FT1.MYI
		@@ -342,6 +351,7 @@ myisam/mi_test1
		myisam/mi_test2
		myisam/mi_test3
		myisam/mi_test_all
		myisam/myisam.log
		myisam/myisamchk
		myisam/myisamlog
		myisam/myisampack
		@@ -369,6 +379,9 @@ mysql.proj
		mysqld.S
		mysqld.sym
		mysys/#mf_iocache.c#
		mysys/getopt.c
		mysys/getopt1.c
		mysys/ste5KbMa
		mysys/test_charset
		mysys/test_dir
		mysys/test_io_cache
		@@ -391,7 +404,9 @@ scripts/mysql_find_rows
		scripts/mysql_fix_extensions
		scripts/mysql_fix_privilege_tables
		scripts/mysql_install_db
		scripts/mysql_secure_installation
		scripts/mysql_setpermission
		scripts/mysql_tableinfo
		scripts/mysql_zap
		scripts/mysqlaccess
		scripts/mysqlbug
		@@ -443,6 +458,7 @@ sql/sql_select.cc.orig
		sql/sql_yacc.cc
		sql/sql_yacc.h
		stamp-h
		stamp-h.in
		strings/conf_to_src
		strings/ctype_autoconf.c
		strings/ctype_extra_sources.c
		@@ -469,18 +485,3 @@ vio/test-ssl
		vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl
		mysys/getopt.c
		mysys/getopt1.c
		scripts/mysql_secure_installation
		mit-pthreads/include/bits
		mit-pthreads/include/pthread/machdep.h
		mit-pthreads/include/pthread/posix.h
		mit-pthreads/include/sys
		mit-pthreads/machdep.c
		mit-pthreads/pg++
		mit-pthreads/pgcc
		scripts/mysql_tableinfo
		libmysql/net.c
		libmysqld/sql_olap.cc
		myisam/myisam.log
		mysys/ste5KbMa

BitKeeper/etc/logging_ok

+2 −1

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ akishkin@work.mysql.com
		arjen@co3064164-a.bitbike.com
		arjen@fred.bitbike.com
		arjen@george.bitbike.com
		bar@bar.mysql.r18.ru
		bar@bar.udmsearch.izhnet.ru
		bell@sanja.is.com.ua
		davida@isil.mysql.com
		@@ -47,6 +48,7 @@ paul@central.snake.net
		paul@teton.kitebird.com
		peter@linux.local
		peter@mysql.com
		ram@ram.(none)
		root@x3.internalnet
		salle@geopard.(none)
		salle@geopard.online.bg
		@@ -73,4 +75,3 @@ worm@altair.is.lan
		zak@balfor.local
		zak@linux.local
		zgreant@mysql.com
		ram@ram.(none)

Docs/manual.texi

+1 −8

Original line number	Diff line number	Diff line
		@@ -50854,7 +50854,6 @@ users use this code as the rest of the code and because of this we are
		not yet 100% confident in this code.

		@menu
		* News-3.23.53:: Changes in release 3.23.53
		* News-3.23.52:: Changes in release 3.23.52
		* News-3.23.51:: Changes in release 3.23.51 (31 May 2002)
		* News-3.23.50:: Changes in release 3.23.50 (21 Apr 2002)
		@@ -50911,13 +50910,7 @@ not yet 100% confident in this code.
		* News-3.23.0:: Changes in release 3.23.0 (05 Aug 1999: Alpha)
		@end menu

		@node News-3.23.53, News-3.23.52, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.53

		@itemize @bullet
		@end itemize

		@node News-3.23.52, News-3.23.51, News-3.23.53, News-3.23.x
		@node News-3.23.52, News-3.23.51, News-3.23.x, News-3.23.x
		@appendixsubsec Changes in release 3.23.52

		@itemize @bullet

configure.in

+1 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
		# Not critical since the generated file is distributed
		AC_PROG_YACC
		AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
		AC_CHECK_PROG(DVIS, tex, manual.dvi)

		AC_MSG_CHECKING("return type of sprintf")

stamp-h.in

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		timestamp