summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-11-21 15:56:48 +0200
committermonty@mashka.mysql.fi <>2002-11-21 15:56:48 +0200
commitdac6498f9b5b28d94473baf46c6e6f174943728d (patch)
treed3df5d3fc1abf364dcbcc8eb2305a1cf62540192 /sql/handler.h
parent305d16a7cb3955c20ab5d119b3eb0968008683b6 (diff)
parente60050c4dd652c7a431aebeb95b7dd944be87bf8 (diff)
downloadmariadb-git-dac6498f9b5b28d94473baf46c6e6f174943728d.tar.gz
Merge with 4.0
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h
index fbc27f4729b..6cbd83af282 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -153,7 +153,6 @@ typedef struct st_ha_create_information
CHARSET_INFO *table_charset;
char *comment,*password;
char *data_file_name, *index_file_name;
- char *create_statement;
ulonglong max_rows,min_rows;
ulonglong auto_increment_value;
ulong table_options;
@@ -230,7 +229,7 @@ public:
void change_table_ptr(TABLE *table_arg) { table=table_arg; }
virtual double scan_time()
{ return ulonglong2double(data_file_length) / IO_SIZE + 1; }
- virtual double read_time(ha_rows rows) { return rows; }
+ virtual double read_time(ha_rows rows) { return rows2double(rows); }
virtual bool fast_key_read() { return 0;}
virtual key_map keys_to_use_for_scanning() { return 0; }
virtual bool has_transactions(){ return 0;}