1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00

MDEV-19863 Add const to TYPELIB pointers

This commit is contained in:
Alexander Barkov
2019-06-26 05:29:44 +04:00
parent 8d4c159b1b
commit 677133f1b3
15 changed files with 58 additions and 53 deletions

View File

@@ -3402,7 +3402,7 @@ Field *Type_handler_enum::make_table_field(const LEX_CSTRING *name,
const Type_all_attributes &attr,
TABLE *table) const
{
TYPELIB *typelib= attr.get_typelib();
const TYPELIB *typelib= attr.get_typelib();
DBUG_ASSERT(typelib);
return new (table->in_use->mem_root)
Field_enum(addr.ptr(), attr.max_length,
@@ -3419,7 +3419,7 @@ Field *Type_handler_set::make_table_field(const LEX_CSTRING *name,
TABLE *table) const
{
TYPELIB *typelib= attr.get_typelib();
const TYPELIB *typelib= attr.get_typelib();
DBUG_ASSERT(typelib);
return new (table->in_use->mem_root)
Field_set(addr.ptr(), attr.max_length,
@@ -4091,10 +4091,10 @@ bool Type_handler_typelib::
Type_all_attributes *func,
Item **items, uint nitems) const
{
TYPELIB *typelib= NULL;
const TYPELIB *typelib= NULL;
for (uint i= 0; i < nitems; i++)
{
TYPELIB *typelib2;
const TYPELIB *typelib2;
if ((typelib2= items[i]->get_typelib()))
{
if (typelib)