Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
This commit is contained in:
commit
abaaa0f37b
@ -2453,7 +2453,7 @@ int main(int argc, char **argv)
|
|||||||
my_bool require_file=0, q_send_flag=0;
|
my_bool require_file=0, q_send_flag=0;
|
||||||
char save_file[FN_REFLEN];
|
char save_file[FN_REFLEN];
|
||||||
MY_INIT(argv[0]);
|
MY_INIT(argv[0]);
|
||||||
|
{
|
||||||
DBUG_ENTER("main");
|
DBUG_ENTER("main");
|
||||||
DBUG_PROCESS(argv[0]);
|
DBUG_PROCESS(argv[0]);
|
||||||
|
|
||||||
@ -2678,6 +2678,7 @@ int main(int argc, char **argv)
|
|||||||
free_used_memory();
|
free_used_memory();
|
||||||
exit(error ? 1 : 0);
|
exit(error ? 1 : 0);
|
||||||
return error ? 1 : 0; /* Keep compiler happy */
|
return error ? 1 : 0; /* Keep compiler happy */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user