diff options
author | unknown <kent@mysql.com> | 2006-02-28 05:40:48 +0100 |
---|---|---|
committer | unknown <kent@mysql.com> | 2006-02-28 05:40:48 +0100 |
commit | fb936d2a86416127c031f3972f669e1c2b4291b3 (patch) | |
tree | f444b61c2bcefaca1a5a70dd1ac2b0708d583993 | |
parent | 8ead0fe65516c282bd196be79a2ec37a94cbb692 (diff) | |
parent | 558c41abfb5d815f0e093795ad3704f2ec6464b2 (diff) | |
download | mariadb-git-fb936d2a86416127c031f3972f669e1c2b4291b3.tar.gz |
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
-rw-r--r-- | sql/log_event.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 207888ed0a7..6c77f609abc 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -6685,16 +6685,6 @@ int Update_rows_log_event::do_before_row_operations(TABLE *table) { DBUG_ASSERT(m_memory == NULL); - if ((table->file->table_flags() & HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS) && - table->s->primary_key < MAX_KEY) - { - /* - We don't need to allocate any memory for m_after_image and - m_key since they are not used. - */ - return 0; - } - int error= 0; if (table->s->keys > 0) |