summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-08-22 00:18:32 +0300
committermonty@donna.mysql.com <>2000-08-22 00:18:32 +0300
commitf0952ce3e1e4a315efb62b09038bcd933b51d5a1 (patch)
treec129c5ccdb3df8c87c28c6a51baac6e208294313 /sql/item.cc
parent48ee575ebcae86c55687b41e6af9c48c75f55d77 (diff)
downloadmariadb-git-f0952ce3e1e4a315efb62b09038bcd933b51d5a1.tar.gz
FLUSH TABLE table_list
Fixes for RENAME TABLE Portability fixes
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc
index cc3f8101601..db4ce792b27 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -125,13 +125,14 @@ const char *Item_ident::full_name() const
return field_name ? field_name : name ? name : "tmp_field";
if (db_name)
{
- tmp=(char*) sql_alloc(strlen(db_name)+strlen(table_name)+
- strlen(field_name)+3);
+ tmp=(char*) sql_alloc((uint) strlen(db_name)+(uint) strlen(table_name)+
+ (uint) strlen(field_name)+3);
strxmov(tmp,db_name,".",table_name,".",field_name,NullS);
}
else
{
- tmp=(char*) sql_alloc(strlen(table_name)+strlen(field_name)+2);
+ tmp=(char*) sql_alloc((uint) strlen(table_name)+
+ (uint) strlen(field_name)+2);
strxmov(tmp,table_name,".",field_name,NullS);
}
return tmp;