mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

Browse source 
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340
This commit is contained in:
unknown 2003-09-19 20:34:59 +04:00
commit 077cea73be
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extra/comp_err.c
View file

@ -109,7 +109,7 @@ int main(int argc,char *argv[])
if (to) if (to)
fclose(to); fclose(to);
if (error) 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); exit(error);
return(0); return(0);

4
heap/hp_test2.c
View file

@ -237,12 +237,12 @@ int main(int argc, char *argv[])
{ {
if (my_errno != HA_ERR_FOUND_DUPP_KEY || key3[n3] == 0) 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); my_errno,record,record2);
goto err; goto err;
} }
if (verbose) 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 else
{ {

4
isam/test2.c
View file

@ -265,12 +265,12 @@ int main(int argc, char *argv[])
{ {
if (my_errno != HA_ERR_FOUND_DUPP_KEY || key3[n3] == 0) 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); my_errno,read_record,record2);
goto err; goto err;
} }
if (verbose) 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 else
{ {

4
myisam/mi_test2.c
View file

@ -329,12 +329,12 @@ int main(int argc, char *argv[])
{ {
if (my_errno != HA_ERR_FOUND_DUPP_KEY || key3[n3] == 0) 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); my_errno,read_record,record2);
goto err; goto err;
} }
if (verbose) 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 else
{ {