mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Move handler dependent tests to the specific handler (myisam, bdb, innodb)
Enabled VARCHAR testing for innodb NOTE: innodb.test currently fails becasue of a bug in InnoDB. I have informed Heikki about this and expect him to fix this ASAP mysql-test/include/varchar.inc: Move handler dependent tests to the specific handler (myisam, bdb, innodb) mysql-test/r/innodb.result: Added varchar tests mysql-test/r/myisam.result: Update results mysql-test/t/bdb.test: Move handler dependent tests to the specific handler (myisam, bdb, innodb) mysql-test/t/innodb.test: Enabled VARCHAR testing mysql-test/t/myisam.test: Move handler dependent tests to the specific handler (myisam, bdb, innodb) sql/sql_parse.cc: Indentation fixes sql/sql_table.cc: Fixed bug introduced when doing cleanup
This commit is contained in:
@ -476,7 +476,7 @@ int prepare_create_field(create_field *sql_field,
|
||||
sql_field->pack_flag|=FIELDFLAG_BINARY;
|
||||
sql_field->length=8; // Unireg field length
|
||||
sql_field->unireg_check=Field::BLOB_FIELD;
|
||||
blob_columns++;
|
||||
(*blob_columns)++;
|
||||
break;
|
||||
case FIELD_TYPE_GEOMETRY:
|
||||
#ifdef HAVE_SPATIAL
|
||||
@ -493,7 +493,7 @@ int prepare_create_field(create_field *sql_field,
|
||||
sql_field->pack_flag|=FIELDFLAG_BINARY;
|
||||
sql_field->length=8; // Unireg field length
|
||||
sql_field->unireg_check=Field::BLOB_FIELD;
|
||||
blob_columns++;
|
||||
(*blob_columns)++;
|
||||
break;
|
||||
#else
|
||||
my_printf_error(ER_FEATURE_DISABLED,ER(ER_FEATURE_DISABLED), MYF(0),
|
||||
@ -570,18 +570,18 @@ int prepare_create_field(create_field *sql_field,
|
||||
/* We should replace old TIMESTAMP fields with their newer analogs */
|
||||
if (sql_field->unireg_check == Field::TIMESTAMP_OLD_FIELD)
|
||||
{
|
||||
if (!timestamps)
|
||||
if (!*timestamps)
|
||||
{
|
||||
sql_field->unireg_check= Field::TIMESTAMP_DNUN_FIELD;
|
||||
timestamps_with_niladic++;
|
||||
(*timestamps_with_niladic)++;
|
||||
}
|
||||
else
|
||||
sql_field->unireg_check= Field::NONE;
|
||||
}
|
||||
else if (sql_field->unireg_check != Field::NONE)
|
||||
timestamps_with_niladic++;
|
||||
(*timestamps_with_niladic)++;
|
||||
|
||||
timestamps++;
|
||||
(*timestamps)++;
|
||||
/* fall-through */
|
||||
default:
|
||||
sql_field->pack_flag=(FIELDFLAG_NUMBER |
|
||||
|
Reference in New Issue
Block a user