diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 4fdbe4b917a36d7d73d3705685033d6054bc4fe5..a98fd9b89506ab9e974a071fce58316e2f7180d0 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1 +1,2 @@ ccarkner@nslinuxw10.bedford.progress.com +heikki@donna.mysql.fi diff --git a/innobase/data/data0data.c b/innobase/data/data0data.c index 0f237f80d69cf652a1914c38fd9dd12175180f85..fe5611bc31254bdf78274ca6210822eec886e1da 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 be65dd5b1b449e142c16ae566860da8846d464f4..82c00a83fb2fb36dd3fecc97cff90d3d65c199c6 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 ca93c6a53838de36a2c926a65fd104059d4ece2d..f6bdaf696629b50f9a798c2e96a33148693bdb15 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);