diff options
| author | unknown <serg@serg.mylan> | 2005-09-30 09:40:49 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-09-30 09:40:49 +0200 |
| commit | 203bb8bc914afa24d0c0c1ead89b89316df6e3a5 (patch) | |
| tree | e0ca4a5e8d1433f06675703a38970e9313c6cfa0 /sql | |
| parent | 3a806cd674deca9288f7555c03172afa4ada01ac (diff) | |
| parent | f4ec1ed519bbfdab91866e7d7779fbf91fcf5ade (diff) | |
| download | mariadb-git-203bb8bc914afa24d0c0c1ead89b89316df6e3a5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/mysqldump.result:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_myisam.cc | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 6b88656dd76..02769c1eb31 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -1703,6 +1703,6 @@ int ha_myisam::ft_read(byte * buf) uint ha_myisam::checksum() const { - return (uint)file->s->state.checksum; + return (uint)file->state->checksum; } diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 635b512fe23..dba4168343a 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4074,7 +4074,7 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables, HA_CHECK_OPT *check_opt) strxmov(table_name, table->db ,".", table->table_name, NullS); - t= table->table= open_ltable(thd, table, TL_READ_NO_INSERT); + t= table->table= open_ltable(thd, table, TL_READ); thd->clear_error(); // these errors shouldn't get client protocol->prepare_for_resend(); |