Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 (4331c705) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -70,3 +70,4 @@ zak@linux.local
		salle@geopard.(none)
		walrus@mysql.com
		zgreant@mysql.com
		salle@geopard.online.bg

Docs/manual.texi

+75 −73

Original line number	Diff line number	Diff line
		@@ -1097,11 +1097,9 @@ as a training partner, please visit the training section at
		@uref{http://www.mysql.com/training/} or contact us at:
		@email{training@@mysql.com}.

		We plan to release the @code{MySQL Certification Program} in 2002. For
		details see @uref{http://www.mysql.com/training/certification.html}.
		If you would like to be kept informed about the
		@code{MySQL Certification Program},
		please e-mail @email{certification@@mysql.com}.
		The @code{MySQL Certification Program} is being released in the second
		half of 2002. For details please see
		@uref{http://www.mysql.com/training/certification.html}.


		@node Business Services Consulting, Business Services Commercial licenses, Business Services Training, MySQL AB business model and services
		@@ -1222,9 +1220,6 @@ training staff at @email{training@@mysql.com}.

		For information on the @code{MySQL Certification Program}, please see
		@uref{http://www.mysql.com/training/certification.html}.
		If you would like to be kept informed about the
		@code{MySQL Certification Program}, please e-mail
		@email{certification@@mysql.com}.
		@xref{Business Services Training}.

		If you're interested in consulting, please visit the consulting
		@@ -5653,26 +5648,12 @@ see @ref{Windows}.
		Check the MySQL homepage (@uref{http://www.mysql.com/}) for
		information about the current version and for downloading instructions.

		Our main download mirror is located at:

		@uref{http://mirrors.sunsite.dk/mysql/}

		If you are interested in becoming a MySQL mirror site, you may
		anonymously rsync with: @code{rsync://sunsite.dk/mysql/}. Please
		send e-mail to @email{webmaster@@mysql.com} notifying us of your mirror to be
		added to the following list.

		If you have problems downloading from our main site, try using one of the
		following mirrors.
		Our main mirror is located at @uref{http://mirrors.sunsite.dk/mysql/}.

		Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.

		@c START_OF_MIRROR_LISTING

		@c Mirrors list is created by PHP script (that really needs to be documented!) from database (tfr@mysql.com)
		@include mirrors.texi

		@c END_OF_MIRROR_LISTING
		For a complete upto-date list of MySQL web/download mirrors, see
		@uref{http://www.mysql.com/downloads/mirrors.html}.
		There you will also find information about becoming a MySQL mirror
		site and how to report a bad or out-of-date mirror.


		@node Which OS, Which version, Getting MySQL, General Installation Issues
		@@ -7012,17 +6993,17 @@ You will need GNU @code{autoconf 2.52}, @code{automake 1.4},

		@code{automake} (1.5) doesn't yet work.

		If you get some strange error during this stage, check that you really
		have @code{libtool} installed!

		@example
		shell> cd mysql
		shell> bk -r edit
		shell> cd mysql-4.0
		shell> bk -r get -Sq
		shell> aclocal; autoheader; autoconf; automake;
		shell> ./configure # Add your favorite options here
		shell> make
		@end example

		If you get some strange error during this stage, check that you really
		have @code{libtool} installed!

		A collection of our standard configure scripts is located in the
		@file{BUILD/} subdirectory. If you are lazy, you can use
		@file{BUILD/compile-pentium-debug}. To compile on a different architecture,
		@@ -8165,7 +8146,7 @@ should check if you need some of the new grants that you didn't need
		before. In particular, you will need @code{REPLICATION SLAVE}
		(instead of @code{FILE}) for new slaves.
		@item
		@code{DOUBLE} and @code{FLOAT} columns are now honoring the
		@code{DOUBLE} and @code{FLOAT} columns now honour the
		@code{UNSIGNED} flag on storage (before, @code{UNSIGNED} was ignored for
		these columns).
		@item
		@@ -22199,8 +22180,6 @@ Monty
		1 row in set (0.09 sec)
		@end example

		@itemize @bullet
		@item
		For logging, you can use the @code{tee} option. The @code{tee} can be
		started with option @code{--tee=...}, or from the command-line
		interactively with command @code{tee}. All the data displayed on the
		@@ -22212,7 +22191,6 @@ used. Note that @code{tee} will flush the results into the file after
		each command, just before the command-line appears again waiting for the
		next command.

		@item
		Browsing, or searching the results in the interactive mode in Unix less,
		more, or any other similar program, is now possible with option
		@code{--pager[=...]}. Without argument, @code{mysql} client will look
		@@ -22227,8 +22205,10 @@ the popen() function, which doesn't exist in Windows. In Windows, the
		@code{tee} option can be used instead, although it may not be as handy
		as @code{pager} can be in some situations.

		A few tips about @code{pager}:
		@itemize @bullet
		@item
		A few tips about @code{pager}: You can use it to write to a file:
		You can use it to write to a file:
		@example
		mysql> pager cat > /tmp/log.txt
		@end example
		@@ -22237,6 +22217,8 @@ for the programs that you want to use with the @code{pager}:
		@example
		mysql> pager less -n -i -S
		@end example

		@item
		From the above do note the option '-S'. You may find it very useful when
		browsing the results; try the option with horizontal output (end
		commands with '\g', or ';') and with vertical output (end commands with
		@@ -22248,8 +22230,7 @@ readable. You can swith the mode between on and off within the interactive
		less with '-S'. See the 'h' for more help about less.

		@item
		Last (unless you already understood this from the above examples ;) you
		can combine very complex ways to handle the results, for example the
		You can combine very complex ways to handle the results, for example the
		following would send the results to two files in two different
		directories, on two different hard-disks mounted on /dr1 and /dr2, yet
		let the results still be seen on the screen via less:
		@@ -22258,7 +22239,8 @@ mysql> pager cat \| tee /dr1/tmp/res.txt \| \
		tee /dr2/tmp/res2.txt \| less -n -i -S
		@end example

		@item
		@end itemize

		You can also combine the two functions above; have the @code{tee}
		enabled, @code{pager} set to 'less' and you will be able to browse the
		results in unix 'less' and still have everything appended into a file
		@@ -22270,10 +22252,10 @@ on the screen, where the Unix @code{tee} used with @code{pager} doesn't
		log quite that much. Last, but not least, the interactive @code{tee} is
		more handy to switch on and off, when you want to log something into a
		file, but want to be able to turn the feature off sometimes.
		@end itemize

		@cindex @code{prompt} command
		You can change the prompt in the @code{mysql} command-line client.
		From MySQL version 4.0.2 it is possible to change the prompt in the
		@code{mysql} command-line client.

		You can use the following prompt options:
		@c FIX these columnfractions have NOT been measured!
		@@ -23554,12 +23536,23 @@ logging on the master. If you start your slaves with data that doesn't
		agree with what was on the master @strong{when the binary log was
		started}, your slaves may fail.

		Starting in 4.0.0, one can use @code{LOAD DATA FROM MASTER} to set up
		a slave. Note that 4.0.0 slaves cannot communicate with 3.23 masters, but 4.0.1
		and later version slaves can. 3.23 slave cannot talk to 4.0 master.
		Please see the following table for an indication of master-slave
		compatibility between different versions. With regard to version 4.0,
		we recommend using same version on both sides.

		@c FIX arjen 2002-07-17 new table, not yet measured for XML/DocBook.
		@multitable @columnfractions .10 .15 .15 .10 .10 .10
		@item @tab @tab @strong{Master} @tab @strong{Master} @tab @strong{Master} @tab @strong{Master}
		@item @tab @tab @strong{3.23.33 and up} @tab @strong{4.0.0} @tab @strong{4.0.1} @tab @strong{4.0.2}
		@item @strong{Slave} @tab @strong{3.23.33 and up} @tab yes @tab no @tab no @tab no
		@item @strong{Slave} @tab @strong{4.0.0} @tab no @tab yes @tab no @tab no
		@item @strong{Slave} @tab @strong{4.0.1} @tab yes @tab no @tab yes @tab no
		@item @strong{Slave} @tab @strong{4.0.2} @tab yes @tab no @tab no @tab yes
		@end multitable

		You must also be aware that @code{LOAD DATA FROM MASTER} currently works only
		if all the tables on the master are @code{MyISAM} type, and will acuire a
		Starting from 4.0.0, one can use @code{LOAD DATA FROM MASTER} to set up
		a slave. Be aware that @code{LOAD DATA FROM MASTER} currently works only
		if all the tables on the master are @code{MyISAM} type, and will acquire a
		global read lock, so no writes are possible while the tables are being
		transferred from the master. This limitation is of a temporary nature, and is
		due to the fact that we have not yet implemented hot lock-free table backup.
		@@ -33787,6 +33780,13 @@ The offset of the initial row is 0 (not 1):
		mysql> SELECT * FROM table LIMIT 5,10; # Retrieve rows 6-15
		@end example

		To retrieve all rows from a certain offset upto the end of the result set,
		you can use -1 for the second parameter:

		@example
		mysql> SELECT * FROM table LIMIT 95,-1; # Retrieve rows 96-last.
		@end example

		If one argument is given, it indicates the maximum number of rows to return:

		@example
		@@ -49652,6 +49652,8 @@ find on the MySQL download page
		(@uref{http://www.mysql.com/downloads/}),
		this means that the version has not yet been released!

		@c Please don't add a new version here without also updating ../configure.in!

		@menu
		* News-4.0.x:: Changes in release 4.0.x (Development; Alpha)
		* News-3.23.x:: Changes in release 3.23.x (Stable)

Docs/mirrors.texi

+13 −5

Original line number	Diff line number	Diff line
		@@ -40,6 +40,10 @@ WWW (@uref{http://www.mysql.cz/})
		@image{Flags/denmark} Denmark [Borsen] @@
		WWW (@uref{http://mysql.borsen.dk/})

		@item
		@image{Flags/denmark} Denmark [Cybercity Internet] @@
		WWW (@uref{http://mysql.mirrors.cybercity.dk/})

		@item
		@image{Flags/denmark} Denmark [SunSITE] @@
		WWW (@uref{http://mirrors.sunsite.dk/mysql/})
		@@ -53,6 +57,10 @@ WWW (@uref{http://mysql.mirror.ok.ee/})
		@image{Flags/finland} Finland [KPNQwest] @@
		WWW (@uref{http://mysql.kpnqwest.fi/})

		@item
		@image{Flags/finland} Finland [Mediatraffic] @@
		WWW (@uref{http://mysql.mediatraffic.fi/})

		@item
		@image{Flags/finland} Finland [tonnikala.net] @@
		WWW (@uref{http://mysql.tonnikala.org/})
		@@ -221,6 +229,10 @@ FTP (@uref{ftp://sunsite.cnlab-switch.ch/mirror/mysql/})
		@image{Flags/turkey} Turkey [proGEN] @@
		WWW (@uref{http://mysql.progen.com.tr/})

		@item
		@image{Flags/turkey} Turkey [Turkish National Academic Network & Information Center] @@
		WWW (@uref{http://mysql.ulak.net.tr/})

		@item
		@image{Flags/great-britain} UK [PLiG/UK] @@
		WWW (@uref{http://ftp.plig.org/pub/mysql/})
		@@ -391,7 +403,7 @@ WWW (@uref{http://mysql.webiiz.com/})

		@item
		@image{Flags/taiwan} Taiwan [I-SHOU University] @@
		WWW (@uref{http://mysql.isu.edu.tw})
		WWW (@uref{http://mysql.isu.edu.tw/})

		@item
		@image{Flags/taiwan} Taiwan [nctu.edu/HsinChu] @@
		@@ -426,10 +438,6 @@ WWW (@uref{http://mysql.soa.co.nz/})

		@itemize @bullet

		@item
		@image{Flags/south-africa} South African Republic [Mweb] @@
		WWW (@uref{http://www.mysql.mweb.co.za/})

		@item
		@image{Flags/south-africa} South African Republic [The Internet Solution/Johannesburg] @@
		FTP (@uref{ftp://ftp.is.co.za/linux/mysql/})

configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
		AC_INIT(sql/mysqld.cc)
		AC_CANONICAL_SYSTEM
		# The Docs Makefile.am parses this line!
		AM_INIT_AUTOMAKE(mysql, 4.0.2-alpha)
		AM_INIT_AUTOMAKE(mysql, 4.0.3-alpha)
		AM_CONFIG_HEADER(config.h)

		PROTOCOL_VERSION=10

include/config-os2.h

+28 −28

Original line number	Diff line number	Diff line
		@@ -64,10 +64,10 @@
		#define NO_FCNTL_NONBLOCK

		#define EFBIG E2BIG
		//#define ENFILE EMFILE
		//#define ENAMETOOLONG (EOS2ERR+2)
		//#define ETIMEDOUT 145
		//#define EPIPE 146
		/#define ENFILE EMFILE /
		/#define ENAMETOOLONG (EOS2ERR+2) /
		/#define ETIMEDOUT 145 /
		/#define EPIPE 146 /
		#define EROFS 147

		#define sleep(A) DosSleep((A)*1000)
		@@ -129,7 +129,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_ALLOCA 1

		/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
		//#define HAVE_ALLOCA_H 1
		/* #define HAVE_ALLOCA_H 1 */

		/* Define if you don't have vprintf but do have _doprnt. */
		/* #undef HAVE_DOPRNT */
		@@ -145,7 +145,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_ST_RDEV 1

		/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
		//#define HAVE_SYS_WAIT_H 1
		/* #define HAVE_SYS_WAIT_H 1 */

		/* Define if you don't have tm_zone but do have the external array
		tzname. */
		@@ -216,7 +216,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_BOOL 1

		/* Have berkeley db installed */
		//#define HAVE_BERKELEY_DB 1
		/* #define HAVE_BERKELEY_DB 1 */

		/* DSB style signals ? */
		/* #undef HAVE_BSD_SIGNALS */
		@@ -395,7 +395,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_CHSIZE 1

		/* Define if you have the cuserid function. */
		//#define HAVE_CUSERID 1
		/* #define HAVE_CUSERID 1 */

		/* Define if you have the dlerror function. */
		#define HAVE_DLERROR 1
		@@ -407,7 +407,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_FCHMOD */

		/* Define if you have the fcntl function. */
		//#define HAVE_FCNTL 1
		/* #define HAVE_FCNTL 1 */

		/* Define if you have the fconvert function. */
		/* #undef HAVE_FCONVERT */
		@@ -425,7 +425,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_FSEEKO */

		/* Define if you have the ftruncate function. */
		//#define HAVE_FTRUNCATE 1
		/* #define HAVE_FTRUNCATE 1 */

		/* Define if you have the getcwd function. */
		#define HAVE_GETCWD 1
		@@ -440,16 +440,16 @@ typedef unsigned long long os_off_t;
		#define HAVE_GETPAGESIZE 1

		/* Define if you have the getpass function. */
		//#define HAVE_GETPASS 1
		/#define HAVE_GETPASS 1 /

		/* Define if you have the getpassphrase function. */
		/* #undef HAVE_GETPASSPHRASE */

		/* Define if you have the getpwnam function. */
		//#define HAVE_GETPWNAM 1
		/* #define HAVE_GETPWNAM 1 */

		/* Define if you have the getpwuid function. */
		//#define HAVE_GETPWUID 1
		/* #define HAVE_GETPWUID 1 */

		/* Define if you have the getrlimit function. */
		/* #undef HAVE_GETRLIMIT */
		@@ -491,7 +491,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_MEMMOVE 1

		/* Define if you have the mkstemp function. */
		//#define HAVE_MKSTEMP 1
		/* #define HAVE_MKSTEMP 1 */

		/* Define if you have the mlockall function. */
		/* #undef HAVE_MLOCKALL */
		@@ -581,7 +581,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_SIGTHREADMASK */

		/* Define if you have the snprintf function. */
		//#define HAVE_SNPRINTF 1
		/* #define HAVE_SNPRINTF 1 */

		/* Define if you have the socket function. */
		#define HAVE_SOCKET 1
		@@ -635,7 +635,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_VIDATTR */

		/* Define if you have the <alloca.h> header file. */
		//#define HAVE_ALLOCA_H 1
		/* #define HAVE_ALLOCA_H 1 */

		/* Define if you have the <arpa/inet.h> header file. */
		#define HAVE_ARPA_INET_H 1
		@@ -647,10 +647,10 @@ typedef unsigned long long os_off_t;
		#define HAVE_CRYPT_H 1

		/* Define if you have the <curses.h> header file. */
		//#define HAVE_CURSES_H 1
		/* #define HAVE_CURSES_H 1 */

		/* Define if you have the <dirent.h> header file. */
		//#define HAVE_DIRENT_H 1
		/* #define HAVE_DIRENT_H 1 */

		/* Define if you have the <fcntl.h> header file. */
		#define HAVE_FCNTL_H 1
		@@ -662,7 +662,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_FLOATINGPOINT_H */

		/* Define if you have the <grp.h> header file. */
		//#define HAVE_GRP_H 1
		/* #define HAVE_GRP_H 1 */

		/* Define if you have the <ieeefp.h> header file. */
		/* #undef HAVE_IEEEFP_H */
		@@ -686,7 +686,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_PATHS_H */

		/* Define if you have the <pwd.h> header file. */
		//#define HAVE_PWD_H 1
		/* #define HAVE_PWD_H 1 */

		/* Define if you have the <sched.h> header file. */
		/* #undef HAVE_SCHED_H */
		@@ -707,16 +707,16 @@ typedef unsigned long long os_off_t;
		#define HAVE_STRING_H 1

		/* Define if you have the <strings.h> header file. */
		//#define HAVE_STRINGS_H 1
		/* #define HAVE_STRINGS_H 1 */

		/* Define if you have the <synch.h> header file. */
		/* #undef HAVE_SYNCH_H */

		/* Define if you have the <sys/dir.h> header file. */
		//#define HAVE_SYS_DIR_H 1
		/* #define HAVE_SYS_DIR_H 1 */

		/* Define if you have the <sys/file.h> header file. */
		//#define HAVE_SYS_FILE_H 1
		/* #define HAVE_SYS_FILE_H 1 */

		/* Define if you have the <sys/ioctl.h> header file. */
		#define HAVE_SYS_IOCTL_H 1
		@@ -758,7 +758,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_SYS_VADVISE_H */

		/* Define if you have the <sys/wait.h> header file. */
		//#define HAVE_SYS_WAIT_H 1
		/* #define HAVE_SYS_WAIT_H 1 */

		/* Define if you have the <term.h> header file. */
		/* #undef HAVE_TERM_H */
		@@ -767,13 +767,13 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_TERMBITS_H */

		/* Define if you have the <termcap.h> header file. */
		//#define HAVE_TERMCAP_H 1
		/* #define HAVE_TERMCAP_H 1 */

		/* Define if you have the <termio.h> header file. */
		//#define HAVE_TERMIO_H 1
		/* /#define HAVE_TERMIO_H 1 */

		/* Define if you have the <termios.h> header file. */
		//#define HAVE_TERMIOS_H 1
		/* #define HAVE_TERMIOS_H 1 */

		/* Define if you have the <unistd.h> header file. */
		#define HAVE_UNISTD_H 1
		@@ -826,4 +826,4 @@ typedef unsigned long long os_off_t;
		/* Define for large files, on AIX-style hosts. */
		/* #undef _LARGE_FILES */

		#endif // __CONFIG_OS2_H__
		#endif /* __CONFIG_OS2_H__ */