Commit 69f68026 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

merge

parents 5fedd2dd 41afc03a

Docs/manual.texi

+8 −3
Original line number Diff line number Diff line
@@ -40563,8 +40563,7 @@ of the following flags in very special circumstances: 














A @code{MYSQL*} connection handle if the connection was successful,















@code{NULL} if the connection was unsuccessful.  For a successful connection,













the return value is the same as the value of the first parameter, unless you













pass @code{NULL} for that parameter.













the return value is the same as the value of the first parameter.





























@subsubheading Errors
























@@ -46274,7 +46273,7 @@ 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.46::                













* News-3.23.46::                Changes in release 3.23.46















* News-3.23.45::                Changes in release 3.23.45















* News-3.23.44::                Changes in release 3.23.44















* News-3.23.43::                Changes in release 3.23.43










@@ -46335,6 +46334,12 @@ One can now kill @code{ANALYZE},@code{REPAIR} and @code{OPTIMIZE TABLE} when













the thread is waiting to get a lock on the table.















@item















Fixed race condition in @code{ANALYZE TABLE}.













@item













Fixed bug when joining with caching (unlikely to happen).













@item













Fixed race condition when using the binary log and @code{INSERT DELAYED}













which could cause the binary log to have rows that was not yet written













to MyISAM tables.















@end itemize





























@node News-3.23.45, News-3.23.44, News-3.23.46, News-3.23.x

























man/mysqld_safe.1



+9
−9






























Original line number
Diff line number
Diff line













.TH SAFE_MYSQLD	  1 "19 December 2000"













.TH SAFE_MYSQLD	  1 "19 December 2000" "safe_mysqld (mysql)" mysql.com















.SH NAME













.BR mysqld_safe













is the recommended way to start a mysqld daemon on Unix. mysqld_safe adds some safety features such as restarting the server when an error occurs and logging run-time information to a log file. 













mysqld_safe \- start the mysqld daemon on Unix.















.SH SYNOPSIS















.B mysqld_safe















.RB [ \-\-basedir=\fP\fIpath\fP ]









@@ -21,18 +20,19 @@ is the recommended way to start a mysqld daemon on Unix. mysqld_safe adds some s













.RB [ \-\-timezone=# ]















.RB [ \-\-user=# ]















.SH DESCRIPTION













mysqld_safe adds some safety features such as restarting the server when an













error occurs and logging run-time information to a log file.













.BR















.TP 















.BR \-\-basedir=\fP\fIpath \fP















.TP 















.BR \-\-core\-file\-size=#













Size of the core file mysqld should be able to create. Passed to ulimit \-c.















.TP 















.BR \-\-defaults\-extra\-file=\fP\fIpath \fP















.TP 















.BR \-\-defaults\-file=\fP\fIpath \fP















.TP 













.BR \-\-open\-files=# 













Size of the core file mysqld should be able to create. Passed to ulimit \-c. 













.TP 















.BR \-\-datadir=\fP\fIpath \fP















.TP 















.BR \-\-err\-log=\fP\fIpath \fP










@@ -76,8 +76,8 @@ which1 (1),













zap (1),















.SH AUTHOR















Ver 1.0, distribution 3.23.29a













Michael (Monty) Widenius (monty@tcx.se),













TCX Datakonsult AB (http://www.tcx.se).













Michael (Monty) Widenius (monty@mysql.com),













MySQL AB (http://www.mysql.com).















This software comes with no warranty.















Manual page by L. (Kill-9) Pedersen 















(kill-9@kill\-9.dk), Mercurmedia Data Model Architect /

































mysql-test/r/null_key.result



+1
−1






























Original line number
Diff line number
Diff line








@@ -21,7 +21,7 @@ table	type	possible_keys	key	key_len	ref	rows	Extra













t1	range	a,b	a	9	NULL	3	where used; Using index















explain select * from t1 where (a is null or a = 7) and b=7;















table	type	possible_keys	key	key_len	ref	rows	Extra













t1	range	a,b	a	9	NULL	2	where used; Using index













t1	ref	a,b	b	4	const	2	where used















explain select * from t1 where (a is null and b>a) or a is null and b=7 limit 2;















table	type	possible_keys	key	key_len	ref	rows	Extra















t1	ref	a,b	a	5	const	3	where used; Using index

































mysql-test/t/rpl000013.test



+1
−1






























Original line number
Diff line number
Diff line








@@ -12,7 +12,7 @@ insert into t2 select * from t1;













connection master1;















create temporary table t1 (n int);















insert into t1 values (4),(5);













insert into t2 select * from t1;













insert into t2 select * from t1 as t10;















save_master_pos;















disconnect master;















connection slave;

































mysql-test/t/rpl000016.test



+3
−2






























Original line number
Diff line number
Diff line








@@ -28,7 +28,7 @@ select * from t1;













connection master;















flush logs;















drop table if exists t2;













create table t2(m int not null primary key);













create table t2(m int not null auto_increment primary key);















insert into t2 values (34),(67),(123);















save_master_pos;















flush logs;









@@ -44,7 +44,8 @@ insert into t2 values(1234);













#same value on the master















connection master;















save_master_pos;













insert into t2 values(1234);













set insert_id=1234;













insert into t2 values(NULL);















connection slave;















sync_with_master;