summaryrefslogtreecommitdiff
path: root/heap/hp_test2.c
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-12-29 16:06:10 +0200
committerunknown <monty@donna.mysql.com>2000-12-29 16:06:10 +0200
commit29fa72526a22c31a79c73a00bf7b1974c44ff9d2 (patch)
tree53ef6da34dcfaf79e0e133177cccfb9bb63a9637 /heap/hp_test2.c
parentccf4b2829882f566d5665e4ddf7eabcd6d197872 (diff)
downloadmariadb-git-29fa72526a22c31a79c73a00bf7b1974c44ff9d2.tar.gz
Fixed --no-defaults in mysqltest
BUILD/compile-pentium-debug: Use /usr/local/BerkeleyDB-dbug/ if available BUILD/compile-pentium: Use /usr/local/BerkeleyDB-opt/ if available Docs/internals.texi: Added 'unedited' documentation for mysys functions Docs/manual.texi: Cleanups client/mysql.cc: Added client language to status client/mysqltest.c: Fixed bug with --no-defaults heap/_check.c: Added option to print status. heap/hp_close.c: Update to use new status interface heap/hp_hash.c: Clean up hash function and add new experimental hash heap/hp_test1.c: Update to use new status interface heap/hp_test2.c: Update to use new status interface include/heap.h: Update to use new status interface mysql-test/r/key_diff.result: Cleanup tests that may give rows in random order mysql-test/r/type_blob.result: Removed \r from output as this confused bk mysql-test/t/key_diff.test: Cleanup tests that may give rows in random order BitKeeper/etc/ignore: Added Docs/my_sys.doc to the ignore list mysql-test/t/type_blob.test: Removed \r from output as this confused bk mysys/hash.c: Add new experimental hash function scripts/safe_mysqld.sh: Added --mysqld option sql/ha_innobase.cc: Fixed store_locking sql/mysqld.cc: Cleaned up warning messages
Diffstat (limited to 'heap/hp_test2.c')
-rw-r--r--heap/hp_test2.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/heap/hp_test2.c b/heap/hp_test2.c
index bfb30e59622..e3ed7a90df5 100644
--- a/heap/hp_test2.c
+++ b/heap/hp_test2.c
@@ -133,7 +133,7 @@ char *argv[];
write_count++; key1[n1]++; key3[n3]=1;
key_check+=n1;
}
- if (testflag == 1 && heap_check_heap(file))
+ if (testflag == 1 && heap_check_heap(file,0))
{
puts("Heap keys crashed");
goto err;
@@ -141,7 +141,7 @@ char *argv[];
}
if (testflag == 1)
goto end;
- if (heap_check_heap(file))
+ if (heap_check_heap(file,0))
{
puts("Heap keys crashed");
goto err;
@@ -173,7 +173,7 @@ char *argv[];
key1[atoi(record+keyinfo[0].seg[0].start)]--;
key3[atoi(record+keyinfo[2].seg[0].start)]=0;
key_check-=atoi(record);
- if (testflag == 2 && heap_check_heap(file))
+ if (testflag == 2 && heap_check_heap(file,0))
{
puts("Heap keys crashed");
goto err;
@@ -183,7 +183,7 @@ char *argv[];
puts("Warning: Skipping delete test because no dupplicate keys");
}
if (testflag==2) goto end;
- if (heap_check_heap(file))
+ if (heap_check_heap(file,0))
{
puts("Heap keys crashed");
goto err;
@@ -239,14 +239,14 @@ char *argv[];
update++;
key_check=key_check-atoi(record)+n1;
}
- if (testflag == 3 && heap_check_heap(file))
+ if (testflag == 3 && heap_check_heap(file,0))
{
puts("Heap keys crashed");
goto err;
}
}
if (testflag == 3) goto end;
- if (heap_check_heap(file))
+ if (heap_check_heap(file,0))
{
puts("Heap keys crashed");
goto err;
@@ -284,7 +284,7 @@ char *argv[];
goto end;
}
dupp_keys--;
- if (heap_check_heap(file))
+ if (heap_check_heap(file,0))
{
puts("Heap keys crashed");
goto err;
@@ -320,7 +320,7 @@ char *argv[];
goto end;
}
dupp_keys-=2;
- if (heap_check_heap(file))
+ if (heap_check_heap(file,0))
{
puts("Heap keys crashed");
goto err;
@@ -353,7 +353,7 @@ char *argv[];
printf("next: Found: %d records of %d\n",ant,write_count-delete);
goto end;
}
- if (heap_check_heap(file))
+ if (heap_check_heap(file,0))
{
puts("Heap keys crashed");
goto err;
@@ -556,7 +556,8 @@ char *argv[];
}
pos++;
}
- if (heap_check_heap(file) || heap_check_heap(file2))
+ printf("- Checking heap tables\n");
+ if (heap_check_heap(file,1) || heap_check_heap(file2,1))
{
puts("Heap keys crashed");
goto err;