diff options
| author | unknown <serg@serg.mylan> | 2004-04-07 16:04:28 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-04-07 16:04:28 +0200 |
| commit | 736853e501181c33e692653d00d7a84c6ff68f25 (patch) | |
| tree | 468a8a5c24e34ef26c95a8deb8a952e75ddb5ca1 /sql/field.cc | |
| parent | c62705434021f8ed7b7cfdf9dbba5b1751ebd6f2 (diff) | |
| download | mariadb-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.cc')
| -rw-r--r-- | sql/field.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/field.cc b/sql/field.cc index 774c4bb651d..6f49b73cb33 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -3098,8 +3098,7 @@ longlong Field_timestamp::val_int(void) } -String *Field_timestamp::val_str(String *val_buffer, - String *val_ptr __attribute__((unused))) +String *Field_timestamp::val_str(String *val_buffer, String *val_ptr) { uint32 temp, temp2; time_t time_arg; @@ -3119,8 +3118,8 @@ String *Field_timestamp::val_str(String *val_buffer, if (temp == 0L) { /* Zero time is "000000" */ - val_buffer->set("0000-00-00 00:00:00", 19, &my_charset_bin); - return val_buffer; + val_ptr->set("0000-00-00 00:00:00", 19, &my_charset_bin); + return val_ptr; } val_buffer->set_charset(&my_charset_bin); // Safety time_arg=(time_t) temp; |