summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@mysql.com>2008-07-09 16:09:30 +0300
committerMichael Widenius <monty@mysql.com>2008-07-09 16:09:30 +0300
commit7f02282404728d1da0990488b60c79fb53c9bf75 (patch)
treec89fb6958a0c403c789ca3b8380ed760b6e3191c /sql/field.cc
parentf9ef13d562756c9c084ee8c5d0f741885a4bc9a1 (diff)
downloadmariadb-git-7f02282404728d1da0990488b60c79fb53c9bf75.tar.gz
Fixes for bug#37276:
- Fixes key corruption where pages wasn't marked that they contained transid. - Fixed bug in block record that could create too small rows when transid was removed. This fixed some asserts() when testing block length Added --abort-source-on-error to the mysql client. (Very helpfull when debugging wrong .sql files) client/client_priv.h: Added enum for new option to mysql client/mysql.cc: Added new option --abort-source-on-error to allow one to get 'source' to stop on error. This is 0 by default, to keep old behaviour. Print file name and line number when getting an error when doing source filename sql/field.cc: Removed old dead code sql/sql_class.cc: Removed old dead code storage/maria/ma_blockrec.c: Added checking of min block length to check_directory() When creating new directory entry, set length to 0; This ensures that the assert checks() on block lengths works properly. Added more DBUG_ASSERT() and more calls to check_directory() In get_head_or_tail_page(), send in correct min_block_length. This is now safe as the length of new blocks are now 0 storage/maria/ma_delete.c: When moving key to parent page, mark page if key has transid storage/maria/ma_write.c: Fixed bug where _ma_find_last_pos() didn't set int_key->flag. Simpilifed code by unrolling loop.
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 6b29314501f..cac5a117b8d 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -9650,9 +9650,8 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type,
}
break;
case MYSQL_TYPE_DATE:
- /* Old date type. */
- if (protocol_version != PROTOCOL_VERSION-1)
- sql_type= MYSQL_TYPE_NEWDATE;
+ /* We don't support creation of MYSQL_TYPE_DATE anymore */
+ sql_type= MYSQL_TYPE_NEWDATE;
/* fall trough */
case MYSQL_TYPE_NEWDATE:
length= 10;