diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-08-31 04:21:14 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-08-31 04:21:14 -0400 |
| commit | 37c67ec9277ac6dbbfc225223b94af0cc57cc24f (patch) | |
| tree | 55215c60e40419243d34c52e9bbe0d0ca998ab3b /sql/ha_partition.cc | |
| parent | abf8f4f1547bfc0aa41dea82005e1b0241fd4fff (diff) | |
| parent | 62accb04de076fd4aa841fd66ea59e9d34636e62 (diff) | |
| download | mariadb-git-37c67ec9277ac6dbbfc225223b94af0cc57cc24f.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug21388
sql/ha_partition.cc:
Auto merged
sql/handler.h:
Auto merged
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index b42cafc2747..30c64760c88 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -361,7 +361,7 @@ bool ha_partition::initialise_partition(MEM_ROOT *mem_root) HA_CAN_GEOMETRY, HA_CAN_FULLTEXT, HA_CAN_SQL_HANDLER, HA_DUPLICATE_POS, HA_CAN_INSERT_DELAYED is disabled until further investigated. */ - m_table_flags= m_file[0]->table_flags(); + m_table_flags= (ulong)m_file[0]->table_flags(); m_low_byte_first= m_file[0]->low_byte_first(); m_pkey_is_clustered= TRUE; file_array= m_file; |