diff options
| author | heikki@donna.mysql.fi <> | 2001-03-27 15:54:05 +0300 |
|---|---|---|
| committer | heikki@donna.mysql.fi <> | 2001-03-27 15:54:05 +0300 |
| commit | 7a13c25f80fc675399a0e2e0528e62e5ed826e31 (patch) | |
| tree | c94b5657011404e045433e0d28a1e808d2267121 /innobase | |
| parent | 44c0545ab9ed408597886810976b2bf63c053aab (diff) | |
| download | mariadb-git-7a13c25f80fc675399a0e2e0528e62e5ed826e31.tar.gz | |
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
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/data/data0data.c | 2 | ||||
| -rw-r--r-- | innobase/data/data0type.c | 2 | ||||
| -rw-r--r-- | innobase/include/data0type.ic | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/innobase/data/data0data.c b/innobase/data/data0data.c index 0f237f80d69..fe5611bc312 100644 --- a/innobase/data/data0data.c +++ b/innobase/data/data0data.c @@ -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); diff --git a/innobase/data/data0type.c b/innobase/data/data0type.c index be65dd5b1b4..82c00a83fb2 100644 --- a/innobase/data/data0type.c +++ b/innobase/data/data0type.c @@ -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); diff --git a/innobase/include/data0type.ic b/innobase/include/data0type.ic index ca93c6a5383..f6bdaf69662 100644 --- a/innobase/include/data0type.ic +++ b/innobase/include/data0type.ic @@ -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); |