diff options
| author | unknown <joerg@trift-lap.fambruehe> | 2007-09-24 15:33:46 +0200 |
|---|---|---|
| committer | unknown <joerg@trift-lap.fambruehe> | 2007-09-24 15:33:46 +0200 |
| commit | 1f1975681ba455b02380ea464fe232d9f641989a (patch) | |
| tree | 55100a646118195da2376393cc1c2170d92fe74f /sql/ha_partition.h | |
| parent | c0850719bc7d02985c98b3ecf6c0ec0b0acecacf (diff) | |
| parent | e34c130441582fab253577cde4cacfaf58d0b1bd (diff) | |
| download | mariadb-git-1f1975681ba455b02380ea464fe232d9f641989a.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
mysql-test/suite/funcs_1/include/ndb_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_cursors.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_func_view.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_views.result:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
sql/ha_partition.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
configure.in:
Version is updated already.
sql/ha_partition.cc:
Manual merge of 5.1.22 changes into main.
Diffstat (limited to 'sql/ha_partition.h')
| -rw-r--r-- | sql/ha_partition.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 8fe512fadb3..9d10aea2b6f 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -469,7 +469,7 @@ public: virtual int reset(void); private: - static const uint NO_CURRENT_PART_ID= 0xFFFFFFFF; + static const uint NO_CURRENT_PART_ID; int loop_extra(enum ha_extra_function operation); void late_extra_cache(uint partition_id); void late_extra_no_cache(uint partition_id); |