diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /storage/heap/hp_test2.c | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'storage/heap/hp_test2.c')
| -rw-r--r-- | storage/heap/hp_test2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/heap/hp_test2.c b/storage/heap/hp_test2.c index af388867c3c..5dab8443f53 100644 --- a/storage/heap/hp_test2.c +++ b/storage/heap/hp_test2.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2000, 2011, Oracle and/or its affiliates. All rights - reserved +/* Copyright (C) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) Monty Program Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -310,7 +310,8 @@ int main(int argc, char *argv[]) if (!silent) printf("- Read last key - delete - prev - prev - opt_delete - prev -> first\n"); - if (heap_rlast(file,record3,0)) goto err; + if (heap_rprev(file,record)) + goto err; if (heap_delete(file,record3)) goto err; key_check-=atoi((char*) record3); key1[atoi((char*) record+keyinfo[0].seg[0].start)]--; @@ -517,7 +518,7 @@ int main(int argc, char *argv[]) } ant=0; - for (error=heap_rlast(file,record,0) ; + for (error=heap_rprev(file,record) ; ! error ; error=heap_rprev(file,record)) { |