mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 16:44:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Auto-merge from mysql-5.1.

Browse source
This commit is contained in:
Alexander Nozdrin 2011-04-08 14:49:41 +04:00
commit b75d77cb81
21 changed files with 91 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item.cc
View file

@ -6121,7 +6121,7 @@ void Item_ref::print(String *str, enum_query_type query_type)
{
THD *thd= current_thd;
append_identifier(thd, str, (*ref)->real_item()->name,
(*ref)->real_item()->name_length);
strlen((*ref)->real_item()->name));
}
else
(*ref)->print(str, query_type);

4
sql/item.h
View file

@ -515,6 +515,10 @@ public:
*/
Item *next;
uint32 max_length;
/*
TODO: convert name and name_length fields into String to keep them in sync
(see bug #11829681/60295 etc).
*/
uint name_length; /* Length of name */
int8 marker;
uint8 decimals;