diff options
| author | unknown <joreland@mysql.com> | 2005-02-25 09:18:33 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-25 09:18:33 +0100 |
| commit | 799489a73ead9887a2f41419d296e58bf0673230 (patch) | |
| tree | e38234f3c4e0fab9b3e8e485d2e814299bbb9bed | |
| parent | 52902cb8497610fb77d96d4c6fb0b1c40d182d8b (diff) | |
| parent | abd8200f77a0b5c8463628fa921f998cbf7498f9 (diff) | |
| download | mariadb-git-799489a73ead9887a2f41419d296e58bf0673230.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
| -rwxr-xr-x | Build-tools/Bootstrap | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_insert_id.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap index 8b769dca3c4..64f865362ca 100755 --- a/Build-tools/Bootstrap +++ b/Build-tools/Bootstrap @@ -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/!"); diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result index 514ab60dafe..8482f631553 100644 --- a/mysql-test/r/rpl_insert_id.result +++ b/mysql-test/r/rpl_insert_id.result @@ -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 |