mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
tests fixes
This commit is contained in:
@ -44,9 +44,11 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
keyinfo[0].keysegs=1;
|
keyinfo[0].keysegs=1;
|
||||||
keyinfo[0].seg=keyseg;
|
keyinfo[0].seg=keyseg;
|
||||||
|
keyinfo[0].algorithm= HA_KEY_ALG_HASH;
|
||||||
keyinfo[0].seg[0].type=HA_KEYTYPE_BINARY;
|
keyinfo[0].seg[0].type=HA_KEYTYPE_BINARY;
|
||||||
keyinfo[0].seg[0].start=1;
|
keyinfo[0].seg[0].start=1;
|
||||||
keyinfo[0].seg[0].length=6;
|
keyinfo[0].seg[0].length=6;
|
||||||
|
keyinfo[0].seg[0].charset=default_charset_info;
|
||||||
keyinfo[0].flag = HA_NOSAME;
|
keyinfo[0].flag = HA_NOSAME;
|
||||||
|
|
||||||
deleted=0;
|
deleted=0;
|
||||||
|
@ -77,6 +77,7 @@ int main(int argc, char *argv[])
|
|||||||
keyinfo[0].seg=keyseg;
|
keyinfo[0].seg=keyseg;
|
||||||
keyinfo[0].keysegs=1;
|
keyinfo[0].keysegs=1;
|
||||||
keyinfo[0].flag= 0;
|
keyinfo[0].flag= 0;
|
||||||
|
keyinfo[0].algorithm= HA_KEY_ALG_HASH;
|
||||||
keyinfo[0].seg[0].type=HA_KEYTYPE_BINARY;
|
keyinfo[0].seg[0].type=HA_KEYTYPE_BINARY;
|
||||||
keyinfo[0].seg[0].start=0;
|
keyinfo[0].seg[0].start=0;
|
||||||
keyinfo[0].seg[0].length=6;
|
keyinfo[0].seg[0].length=6;
|
||||||
@ -85,6 +86,7 @@ int main(int argc, char *argv[])
|
|||||||
keyinfo[1].seg=keyseg+1;
|
keyinfo[1].seg=keyseg+1;
|
||||||
keyinfo[1].keysegs=2;
|
keyinfo[1].keysegs=2;
|
||||||
keyinfo[1].flag=0;
|
keyinfo[1].flag=0;
|
||||||
|
keyinfo[1].algorithm= HA_KEY_ALG_HASH;
|
||||||
keyinfo[1].seg[0].type=HA_KEYTYPE_BINARY;
|
keyinfo[1].seg[0].type=HA_KEYTYPE_BINARY;
|
||||||
keyinfo[1].seg[0].start=7;
|
keyinfo[1].seg[0].start=7;
|
||||||
keyinfo[1].seg[0].length=6;
|
keyinfo[1].seg[0].length=6;
|
||||||
@ -98,14 +100,16 @@ int main(int argc, char *argv[])
|
|||||||
keyinfo[2].seg=keyseg+3;
|
keyinfo[2].seg=keyseg+3;
|
||||||
keyinfo[2].keysegs=1;
|
keyinfo[2].keysegs=1;
|
||||||
keyinfo[2].flag=HA_NOSAME;
|
keyinfo[2].flag=HA_NOSAME;
|
||||||
|
keyinfo[2].algorithm= HA_KEY_ALG_HASH;
|
||||||
keyinfo[2].seg[0].type=HA_KEYTYPE_BINARY;
|
keyinfo[2].seg[0].type=HA_KEYTYPE_BINARY;
|
||||||
keyinfo[2].seg[0].start=12;
|
keyinfo[2].seg[0].start=12;
|
||||||
keyinfo[2].seg[0].length=8;
|
keyinfo[2].seg[0].length=8;
|
||||||
keyinfo[2].seg[0].null_bit=0;
|
keyinfo[2].seg[0].null_bit=0;
|
||||||
keyinfo[2].seg[0].charset=default_charset_info;
|
keyinfo[2].seg[0].charset=default_charset_info;
|
||||||
|
keyinfo[3].seg=keyseg+4;
|
||||||
keyinfo[3].keysegs=1;
|
keyinfo[3].keysegs=1;
|
||||||
keyinfo[3].flag=HA_NOSAME;
|
keyinfo[3].flag=HA_NOSAME;
|
||||||
keyinfo[3].seg=keyseg+4;
|
keyinfo[3].algorithm= HA_KEY_ALG_HASH;
|
||||||
keyinfo[3].seg[0].type=HA_KEYTYPE_BINARY;
|
keyinfo[3].seg[0].type=HA_KEYTYPE_BINARY;
|
||||||
keyinfo[3].seg[0].start=37;
|
keyinfo[3].seg[0].start=37;
|
||||||
keyinfo[3].seg[0].length=1;
|
keyinfo[3].seg[0].length=1;
|
||||||
@ -553,7 +557,8 @@ int main(int argc, char *argv[])
|
|||||||
heap_close(file2);
|
heap_close(file2);
|
||||||
|
|
||||||
printf("- Creating output heap-file 2\n");
|
printf("- Creating output heap-file 2\n");
|
||||||
if (!(file2=heap_open(filename2, 2)))
|
if (heap_create(filename2,1,keyinfo,reclength,0L,0L) ||
|
||||||
|
!(file2= heap_open(filename2, 2)))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
printf("- Copying and removing records\n");
|
printf("- Copying and removing records\n");
|
||||||
|
Reference in New Issue
Block a user