diff options
| author | unknown <tsmith@sita.local> | 2007-08-28 01:02:57 -0600 |
|---|---|---|
| committer | unknown <tsmith@sita.local> | 2007-08-28 01:02:57 -0600 |
| commit | 8e0805db78e2f2609ac17dd22dac6a76a6d214f8 (patch) | |
| tree | 98e9ba22af82263a0e34b95beb76d69ea5e664a2 /sql/ha_partition.cc | |
| parent | 95834a51f4b960f24d3c9366bbfd8aee6c73da4e (diff) | |
| download | mariadb-git-8e0805db78e2f2609ac17dd22dac6a76a6d214f8.tar.gz | |
Post-merge fixes
sql/ha_partition.cc:
Post-merge fix (remove duplicate definition of ::column_bitmaps_signal)
sql/mysqld.cc:
Post-merge fix (cast away some compiler warnings in DBUG_PRINT, remove
duplicate definition of OPT_KEEP_FILES_ON_CREATE).
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 26f1419fa07..42cbaa1cdb0 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -5601,13 +5601,6 @@ int ha_partition::indexes_are_disabled(void) } -void ha_partition::column_bitmaps_signal() -{ - handler::column_bitmaps_signal(); - bitmap_union(table->read_set, &m_part_info->full_part_field_set); -} - - /**************************************************************************** MODULE Partition Share ****************************************************************************/ |