summaryrefslogtreecommitdiff
path: root/innobase/data
diff options
context:
space:
mode:
authorunknown <heikki@donna.mysql.fi>2001-03-27 15:54:05 +0300
committerunknown <heikki@donna.mysql.fi>2001-03-27 15:54:05 +0300
commit56b72401fee3155d56437fef9f55512f5ac6176b (patch)
treec94b5657011404e045433e0d28a1e808d2267121 /innobase/data
parente75b64c0ca252f5b375cd1c1ae1a5fddd80f032e (diff)
downloadmariadb-git-56b72401fee3155d56437fef9f55512f5ac6176b.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 innobase/data/data0data.c: Small changes to eliminate some asserts in the debug version innobase/data/data0type.c: Small changes to eliminate some asserts in the debug version innobase/include/data0type.ic: Small changes to eliminate some asserts in the debug version
Diffstat (limited to 'innobase/data')
-rw-r--r--innobase/data/data0data.c2
-rw-r--r--innobase/data/data0type.c2
2 files changed, 2 insertions, 2 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);