mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340
This commit is contained in:
commit
077cea73be
4 changed files with 7 additions and 7 deletions
|
@ -109,7 +109,7 @@ int main(int argc,char *argv[])
|
|||
if (to)
|
||||
fclose(to);
|
||||
if (error)
|
||||
fprintf(stderr,"Can't uppdate messagefile %s, errno: %d\n",*argv,errno);
|
||||
fprintf(stderr,"Can't update messagefile %s, errno: %d\n",*argv,errno);
|
||||
|
||||
exit(error);
|
||||
return(0);
|
||||
|
|
|
@ -237,12 +237,12 @@ int main(int argc, char *argv[])
|
|||
{
|
||||
if (my_errno != HA_ERR_FOUND_DUPP_KEY || key3[n3] == 0)
|
||||
{
|
||||
printf("error: %d; can't uppdate:\nFrom: \"%s\"\nTo: \"%s\"\n",
|
||||
printf("error: %d; can't update:\nFrom: \"%s\"\nTo: \"%s\"\n",
|
||||
my_errno,record,record2);
|
||||
goto err;
|
||||
}
|
||||
if (verbose)
|
||||
printf("Double key when tryed to uppdate:\nFrom: \"%s\"\nTo: \"%s\"\n",record,record2);
|
||||
printf("Double key when tried to update:\nFrom: \"%s\"\nTo: \"%s\"\n",record,record2);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -265,12 +265,12 @@ int main(int argc, char *argv[])
|
|||
{
|
||||
if (my_errno != HA_ERR_FOUND_DUPP_KEY || key3[n3] == 0)
|
||||
{
|
||||
printf("error: %d; can't uppdate:\nFrom: \"%s\"\nTo: \"%s\"\n",
|
||||
printf("error: %d; can't update:\nFrom: \"%s\"\nTo: \"%s\"\n",
|
||||
my_errno,read_record,record2);
|
||||
goto err;
|
||||
}
|
||||
if (verbose)
|
||||
printf("Double key when tryed to uppdate:\nFrom: \"%s\"\nTo: \"%s\"\n",record,record2);
|
||||
printf("Double key when tried to update:\nFrom: \"%s\"\nTo: \"%s\"\n",record,record2);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -329,12 +329,12 @@ int main(int argc, char *argv[])
|
|||
{
|
||||
if (my_errno != HA_ERR_FOUND_DUPP_KEY || key3[n3] == 0)
|
||||
{
|
||||
printf("error: %d; can't uppdate:\nFrom: \"%s\"\nTo: \"%s\"\n",
|
||||
printf("error: %d; can't update:\nFrom: \"%s\"\nTo: \"%s\"\n",
|
||||
my_errno,read_record,record2);
|
||||
goto err;
|
||||
}
|
||||
if (verbose)
|
||||
printf("Double key when tryed to uppdate:\nFrom: \"%s\"\nTo: \"%s\"\n",record,record2);
|
||||
printf("Double key when tried to update:\nFrom: \"%s\"\nTo: \"%s\"\n",record,record2);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue