summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-04-07 16:04:28 +0200
committerunknown <serg@serg.mylan>2004-04-07 16:04:28 +0200
commit736853e501181c33e692653d00d7a84c6ff68f25 (patch)
tree468a8a5c24e34ef26c95a8deb8a952e75ddb5ca1 /sql/field.h
parentc62705434021f8ed7b7cfdf9dbba5b1751ebd6f2 (diff)
downloadmariadb-git-736853e501181c33e692653d00d7a84c6ff68f25.tar.gz
post-review fixes
HA_EXTRA_WRITE_CACHE now part of start_bulk_insert() test cleanups BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585: Delete: mysql-test/t/repair_part2-master.sh BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001: Delete: mysql-test/t/repair_part2.test BitKeeper/deleted/.del-repair_part2.result~72ca166fb248b566: Delete: mysql-test/r/repair_part2.result mysql-test/r/myisam.result: updated mysql-test/t/lowercase_table2.test: typo fixed mysql-test/r/repair.result: single repair.test from repair_part[12].test mysql-test/t/lowercase_table3.test: typo fixed mysql-test/t/lowercase_table_qcache.test: newline added mysql-test/t/myisam.test: updated mysql-test/t/repair.test: single repair.test from repair_part[12].test sql/field.cc: reverted sql/field.h: style fix sql/ha_myisam.cc: add HA_EXTRA_WRITE_CACHE to start_bulk_insert sql/sql_insert.cc: add HA_EXTRA_WRITE_CACHE to start_bulk_insert sql/sql_load.cc: add HA_EXTRA_WRITE_CACHE to start_bulk_insert sql/sql_table.cc: add HA_EXTRA_WRITE_CACHE to start_bulk_insert
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h
index e6188d43f57..8ebc7412c35 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -98,8 +98,9 @@ public:
virtual void store_time(TIME *ltime,timestamp_type t_type);
virtual double val_real(void)=0;
virtual longlong val_int(void)=0;
- String *val_str(String *str) { return val_str(str, str); }
- /* val_str(buf1, buf2) gets two buffers and should use them as follows:
+ inline String *val_str(String *str) { return val_str(str, str); }
+ /*
+ val_str(buf1, buf2) gets two buffers and should use them as follows:
if it needs a temp buffer to convert result to string - use buf1
example Field_tiny::val_str()
if the value exists as a string already - use buf2