summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb.result
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-10-09 03:35:29 +0300
committerunknown <monty@hundin.mysql.fi>2001-10-09 03:35:29 +0300
commit1c64f355b4e0bb7a709dd850857a9bb41b11d09c (patch)
tree07f2a0acc005ba2b7fb714ce60cb6f8417c6f60e /mysql-test/r/innodb.result
parent9417dc5c17bc0c35d04e20e600ce7804ec20e736 (diff)
downloadmariadb-git-1c64f355b4e0bb7a709dd850857a9bb41b11d09c.tar.gz
One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files, which makes all normal source files much easier to write and maintain. Portability fixes. Docs/manual.texi: Updated upgrading from 3.23 -> 4.0 client/mysqladmin.c: Portability fixes client/mysqlshow.c: Portability fixes extra/resolveip.c: Portability fixes include/my_global.h: Portability fixes include/my_net.h: One should not only have to include my_net.h to work with sockets. This wrapper noew will include all the necessary, system specific files, which makes all normal source files much easier to write and maintain. include/mysql_com.h: Portability fixes libmysql/net.c: Portability fixes libmysqld/lib_vio.c: Portability fixes mysql-test/r/drop.result: Fix crashed tests mysql-test/r/err000001.result: Fix crashed tests mysql-test/r/innodb.result: Fix crashed tests mysql-test/r/overflow.result: Fix crashed tests sql/net_serv.cc: Use new my_net.h vio/vio.c: Use new my_net.h vio/viosocket.c: Use new my_net.h vio/viossl.c: Use new my_net.h
Diffstat (limited to 'mysql-test/r/innodb.result')
-rw-r--r--mysql-test/r/innodb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index c96ce4e5e33..596edb84705 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -48,7 +48,7 @@ id parent_id level
15 102 2
update t1 set id=id+1000;
update t1 set id=1024 where id=1009;
-Duplicate entry '1024' for key 1
+Got one of the listed errors
select * from t1;
id parent_id level
1001 100 0