database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for bug in WHERE key='j' or key='J'

Browse Source
This commit is contained in:
monty@hundin.mysql.fi
2002-03-22 14:03:42 +02:00
parent 82d87ebd16
commit ed040fe21e
10 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
myisam/myisampack.c
View File

@ -251,7 +251,7 @@ static struct option long_options[] =
static void print_version(void)
{
printf("%s Ver 1.11 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE);
printf("%s Ver 1.12 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE);
}
static void usage(void)
@ -594,10 +594,7 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table)
else
{
if (tmp_dir[0])
{
if (!(error=my_copy(new_name,org_name,MYF(MY_WME))))
VOID(my_delete(new_name,MYF(MY_WME)));
}
error=my_copy(new_name,org_name,MYF(MY_WME));
else
error=my_rename(new_name,org_name,MYF(MY_WME));
if (!error)
@ -607,13 +604,8 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table)
else
{
if (tmp_dir[0])
{
if (!(error=my_copy(new_name,org_name,
MYF(MY_WME | MY_HOLD_ORIGINAL_MODES
| MY_COPYTIME))))
VOID(my_delete(new_name,MYF(MY_WME)));
}
error=my_copy(new_name,org_name,
MYF(MY_WME | MY_HOLD_ORIGINAL_MODES | MY_COPYTIME));
else
error=my_redel(org_name,new_name,MYF(MY_WME | MY_COPYTIME));
}
@ -627,6 +619,7 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table)
if (error)
{
VOID(fprintf(stderr,"Aborting: %s is not compressed\n",org_name));
VOID(my_delete(new_name,MYF(MY_WME)));
DBUG_RETURN(-1);
}
if (write_loop || verbose)