Commit 7a13c25f authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi

data0data.c Small changes to eliminate some asserts in the debug version

data0type.c	Small changes to eliminate some asserts in the debug version
data0type.ic	Small changes to eliminate some asserts in the debug version
parent 44c0545a
......@@ -111,7 +111,7 @@ dfield_check_typed(
/* out: TRUE if ok */
dfield_t* field) /* in: data field */
{
ut_a(dfield_get_type(field)->mtype <= DATA_SYS);
ut_a(dfield_get_type(field)->mtype <= DATA_MYSQL);
ut_a(dfield_get_type(field)->mtype >= DATA_VARCHAR);
return(TRUE);
......
......@@ -25,7 +25,7 @@ dtype_validate(
dtype_t* type) /* in: type struct to validate */
{
ut_a(type);
ut_a((type->mtype >= DATA_VARCHAR) && (type->mtype <= DATA_SYS));
ut_a((type->mtype >= DATA_VARCHAR) && (type->mtype <= DATA_MYSQL));
if (type->mtype == DATA_SYS) {
ut_a(type->prtype >= DATA_ROW_ID);
......
......@@ -149,7 +149,6 @@ dtype_store_for_order_and_null_size(
dtype_t* type) /* in: type struct */
{
ut_ad(4 == DATA_ORDER_NULL_TYPE_BUF_SIZE);
ut_ad(type->prtype < 256);
buf[0] = (byte)(type->mtype & 0xFF);
buf[1] = (byte)(type->prtype & 0xFF);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment