diff options
author | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-08-18 14:16:11 +0200 |
---|---|---|
committer | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-08-18 14:16:11 +0200 |
commit | 3468780e0cb431bfedc399b1cd0924b3dc0b3ddc (patch) | |
tree | 27c5a8f1877100abbd3abe5c56aaedb5e46ad964 /sql/ha_innodb.cc | |
parent | 5c8c2ab43b73984889fd6c337523b657861793ea (diff) | |
download | mariadb-git-3468780e0cb431bfedc399b1cd0924b3dc0b3ddc.tar.gz |
innodb r702
innodb r719
innobase/btr/btr0btr.c:
innodb r702
innobase/buf/buf0buf.c:
innodb r702
innobase/dict/dict0dict.c:
innodb r702
innobase/fil/fil0fil.c:
innodb r702
innobase/fsp/fsp0fsp.c:
innodb r702
innobase/include/btr0cur.ic:
innodb r719
innobase/include/buf0buf.ic:
innodb r702
innobase/log/log0log.c:
innodb r702
innobase/log/log0recv.c:
innodb r702
innobase/os/os0file.c:
innodb r702
innobase/row/row0mysql.c:
innodb r702
innobase/row/row0sel.c:
innodb r702
innobase/srv/srv0start.c:
innodb r702
innobase/ut/ut0dbg.c:
innodb r702
sql/ha_innodb.cc:
innodb r702
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r-- | sql/ha_innodb.cc | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 472506f9903..c56be6376d0 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2190,8 +2190,7 @@ ha_innobase::open( "have forgotten\nto delete the corresponding " ".frm files of InnoDB tables, or you\n" "have moved .frm files to another database?\n" - "Look from section 15.1 of " - "http://www.innodb.com/ibman.html\n" + "See http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n" "how you can resolve the problem.\n", norm_name); free_share(share); @@ -2208,8 +2207,7 @@ ha_innobase::open( "Have you deleted the .ibd file from the " "database directory under\nthe MySQL datadir, " "or have you used DISCARD TABLESPACE?\n" - "Look from section 15.1 of " - "http://www.innodb.com/ibman.html\n" + "See http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n" "how you can resolve the problem.\n", norm_name); free_share(share); @@ -5384,13 +5382,14 @@ ha_innobase::info( for (i = 0; i < table->s->keys; i++) { if (index == NULL) { ut_print_timestamp(stderr); - sql_print_error("Table %s contains less " + sql_print_error("Table %s contains fewer " "indexes inside InnoDB than " "are defined in the MySQL " ".frm file. Have you mixed up " ".frm files from different " - "installations? See section " - "15.1 at http://www.innodb.com/ibman.html", + "installations? See " +"http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n", + ib_table->name); break; } @@ -5399,17 +5398,11 @@ ha_innobase::info( if (j + 1 > index->n_uniq) { ut_print_timestamp(stderr); - sql_print_error("Index %s of %s has " - "%lu columns unique " - "inside InnoDB, but " - "MySQL is asking " - "statistics for %lu " - "columns. Have you " - "mixed up .frm files " - "from different " - "installations? See " - "section 15.1 at " - "http://www.innodb.com/ibman.html", + sql_print_error( +"Index %s of %s has %lu columns unique inside InnoDB, but MySQL is asking " +"statistics for %lu columns. Have you mixed up .frm files from different " +"installations? " +"See http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n", index->name, ib_table->name, (unsigned long) @@ -6207,7 +6200,7 @@ ha_innobase::transactional_table_lock( "table %s does not exist.\n" "Have you deleted the .ibd file from the database directory under\n" "the MySQL datadir?" -"Look from section 15.1 of http://www.innodb.com/ibman.html\n" +"See http://dev.mysql.com/doc/refman/5.0/en/innodb-troubleshooting.html\n" "how you can resolve the problem.\n", prebuilt->table->name); DBUG_RETURN(HA_ERR_CRASHED); |