diff options
| author | unknown <stewart@willster.(none)> | 2006-10-18 18:51:39 +1000 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-10-18 18:51:39 +1000 |
| commit | 9910031cbea0c9ac5361009a00bb07dc37d5dc7d (patch) | |
| tree | 158cd8baa75df0668f66387c30ec45326aad4cf2 /storage/heap/ha_heap.h | |
| parent | 7968c44c0edb8c0d098f9ba81455ee29b855e3cc (diff) | |
| parent | 46152464aa27954659a028d625f82acc601b7bbe (diff) | |
| download | mariadb-git-9910031cbea0c9ac5361009a00bb07dc37d5dc7d.tar.gz | |
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/blackhole/ha_blackhole.h:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/csv/ha_tina.h:
Auto merged
storage/example/ha_example.cc:
Auto merged
storage/example/ha_example.h:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/federated/ha_federated.h:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/heap/ha_heap.h:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
merge
sql/ha_ndbcluster.h:
merge
sql/handler.h:
merge
sql/sql_delete.cc:
merge
storage/archive/ha_archive.h:
merge
storage/innobase/handler/ha_innodb.cc:
merge
storage/innobase/handler/ha_innodb.h:
merge
storage/myisam/ha_myisam.cc:
merge
storage/myisammrg/ha_myisammrg.h:
merge
Diffstat (limited to 'storage/heap/ha_heap.h')
| -rw-r--r-- | storage/heap/ha_heap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h index 0f6386655cb..f0c01d5e3a5 100644 --- a/storage/heap/ha_heap.h +++ b/storage/heap/ha_heap.h @@ -89,7 +89,7 @@ public: int rnd_next(byte *buf); int rnd_pos(byte * buf, byte *pos); void position(const byte *record); - void info(uint); + int info(uint); int extra(enum ha_extra_function operation); int reset(); int external_lock(THD *thd, int lock_type); |