Commit 799489a7 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1
parents 52902cb8 abd8200f

Build-tools/Bootstrap

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ if (defined $opt_changelog) 
unless ($opt_skip_manual)

{

	&logger("Updating manual files");

	foreach $file qw/internals manual reservedwords/

	foreach $file qw/internals manual reservedwords errmsg-table cl-errmsg-table/

	{

		system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0

		or &abort("Could not update $file.texi in $target_dir/Docs/!");

mysql-test/r/rpl_insert_id.result

+1 −1
Original line number Diff line number Diff line
@@ -72,4 +72,4 @@ SET TIMESTAMP=1000000000; 
CREATE TABLE t1 ( a INT UNIQUE );

SET FOREIGN_KEY_CHECKS=0;

INSERT INTO t1 VALUES (1),(1);

Duplicate entry '1' for key 1
 
ERROR 23000: Duplicate entry '1' for key 1