diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-03-10 09:07:42 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-03-10 09:07:42 +0200 |
| commit | 2f7e93afabbbf95dd2e2f2701f4f9bc04846db98 (patch) | |
| tree | 4e2a6470e06766ef687951e1ea71c14dbf0d3b2f /innobase/log | |
| parent | 83fa3560bc13734b2d92c84064d836fd2e05bc8d (diff) | |
| parent | 16103a014fb5a26bac85736845209353642966f5 (diff) | |
| download | mariadb-git-2f7e93afabbbf95dd2e2f2701f4f9bc04846db98.tar.gz | |
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/log/log0recv.c:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
Diffstat (limited to 'innobase/log')
| -rw-r--r-- | innobase/log/log0recv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/innobase/log/log0recv.c b/innobase/log/log0recv.c index ac230f6461b..6597122f104 100644 --- a/innobase/log/log0recv.c +++ b/innobase/log/log0recv.c @@ -2608,8 +2608,10 @@ recv_recovery_from_checkpoint_start( a note to the user about it */ fprintf(stderr, - "InnoDB: The log file was created by ibbackup --restore at\n" + "InnoDB: The log file was created by ibbackup --apply-log at\n" "InnoDB: %s\n", log_hdr_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP); + fprintf(stderr, +"InnoDB: NOTE: the following crash recovery is part of a normal restore.\n"); /* Wipe over the label now */ |