diff options
| author | unknown <serg@build.mysql2.com> | 2002-09-26 17:52:52 +0200 |
|---|---|---|
| committer | unknown <serg@build.mysql2.com> | 2002-09-26 17:52:52 +0200 |
| commit | a703057a92d1f62c7f07c9fdde09ff7fad90c1c3 (patch) | |
| tree | 81ca0ef652da7e9fde48323cd33e6ddd44dee496 | |
| parent | 7bba4e4c55a6913e78de332e979a88b2aad34ae8 (diff) | |
| download | mariadb-git-a703057a92d1f62c7f07c9fdde09ff7fad90c1c3.tar.gz | |
COUNT(*) for merge can be longlong even if it's long for MyISAM
| -rw-r--r-- | sql/ha_myisammrg.cc | 4 | ||||
| -rw-r--r-- | sql/handler.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index ee72216baa5..db83732bd50 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -184,8 +184,8 @@ void ha_myisammrg::info(uint flag) { MYMERGE_INFO info; (void) myrg_status(file,&info,flag); - records = (ha_rows) info.records; - deleted = (ha_rows) info.deleted; + records = info.records; + deleted = info.deleted; data_file_length=info.data_file_length; errkey = info.errkey; table->keys_in_use= set_bits(key_map, table->keys); diff --git a/sql/handler.h b/sql/handler.h index 4e854aa00a6..c1f62dd26ef 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -192,8 +192,8 @@ public: byte *dupp_ref; /* Pointer to dupp row */ uint ref_length; /* Length of ref (1-8) */ uint block_size; /* index block size */ - ha_rows records; /* Records i datafilen */ - ha_rows deleted; /* Deleted records */ + ulonglong records; /* Records i datafilen */ + ulonglong deleted; /* Deleted records */ ulonglong data_file_length; /* Length off data file */ ulonglong max_data_file_length; /* Length off data file */ ulonglong index_file_length; |