diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-10-16 15:40:40 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-10-16 15:40:40 -0400 |
| commit | e1ff81bbce1bb71b447b754b47521db3e0cd92b0 (patch) | |
| tree | 3635695d4cd8a873ae2eac0d07692901393eedfc /sql/ha_partition.h | |
| parent | ef9e4ab6aa8ffa5a82205ab25f099477e04a6c10 (diff) | |
| parent | 93f4daf1b45f425057138b575caed00d489d002b (diff) | |
| download | mariadb-git-e1ff81bbce1bb71b447b754b47521db3e0cd92b0.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug18198
mysql-test/r/partition.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/item_func.h:
Auto merged
sql/partition_info.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_partition.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item_cmpfunc.h:
e
Diffstat (limited to 'sql/ha_partition.h')
| -rw-r--r-- | sql/ha_partition.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index b66db205549..008bda01bc9 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -45,9 +45,10 @@ private: { partition_index_read= 0, partition_index_first= 1, - partition_index_last= 2, - partition_index_read_last= 3, - partition_no_index_scan= 4 + partition_index_first_unordered= 2, + partition_index_last= 3, + partition_index_read_last= 4, + partition_no_index_scan= 5 }; /* Data for the partition handler */ int m_mode; // Open mode |