diff options
| author | unknown <tsmith@maint2.mysql.com> | 2006-09-04 23:05:17 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint2.mysql.com> | 2006-09-04 23:05:17 +0200 |
| commit | fbf2bc183aad7dd3a25bf0877ebdf89f946674b4 (patch) | |
| tree | 30c11695e7ec04766ed31830ca235369d659d638 /storage/innobase/srv/srv0start.c | |
| parent | d57163fcf84d6fc0e8cad5fdbbe5c14274eb694c (diff) | |
| parent | 3c4e333d006758162e1912a2f5898640b7772967 (diff) | |
| download | mariadb-git-fbf2bc183aad7dd3a25bf0877ebdf89f946674b4.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51
into maint2.mysql.com:/data/localhome/tsmith/bk/51
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/config-netware.h:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_mgm.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/innobase/btr/btr0btr.c:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/fsp/fsp0fsp.c:
Auto merged
storage/innobase/include/btr0cur.ic:
Auto merged
storage/innobase/include/buf0buf.ic:
Auto merged
storage/innobase/log/log0log.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/innobase/ut/ut0dbg.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
BUILD/check-cpu:
Manual merge
storage/innobase/row/row0mysql.c:
Manual merge
Diffstat (limited to 'storage/innobase/srv/srv0start.c')
| -rw-r--r-- | storage/innobase/srv/srv0start.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index 22456430c60..8346203f3f7 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -1691,7 +1691,7 @@ NetWare. */ "InnoDB: You have now successfully upgraded to the multiple tablespaces\n" "InnoDB: format. You should NOT DOWNGRADE to an earlier version of\n" "InnoDB: InnoDB! But if you absolutely need to downgrade, see\n" -"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/multiple-tablespaces.html\n" +"InnoDB: http://dev.mysql.com/doc/refman/5.1/en/multiple-tablespaces.html\n" "InnoDB: for instructions.\n"); } |