1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts

Abort if we can't allocate memory for table cache
Fix bug with multi-update-tables and BDB tables.
This commit is contained in:
monty@mysql.com
2004-03-12 01:10:22 +02:00
parent 1c0d5ad25c
commit e27960a44e
8 changed files with 38 additions and 26 deletions

View File

@ -866,14 +866,16 @@ int multi_update::do_updates(bool from_send_error)
DBUG_RETURN(0);
for (cur_table= update_tables; cur_table ; cur_table= cur_table->next)
{
byte *ref_pos;
TABLE *tmp_table;
table = cur_table->table;
if (table == table_to_update)
continue; // Already updated
org_updated= updated;
byte *ref_pos;
TABLE *tmp_table= tmp_tables[cur_table->shared];
tmp_table= tmp_tables[cur_table->shared];
tmp_table->file->extra(HA_EXTRA_CACHE); // Change to read cache
(void) table->file->rnd_init(0);
table->file->extra(HA_EXTRA_NO_CACHE);
/*
@ -940,6 +942,7 @@ int multi_update::do_updates(bool from_send_error)
else
trans_safe= 0; // Can't do safe rollback
}
(void) table->file->rnd_end();
}
DBUG_RETURN(0);