Merge mysql.com:/usr/local/bk/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0-merge

sql/item.h

@@ -342,7 +342,10 @@ class Item_splocal : public Item
 
   inline void print(String *str)
   {
+    str->reserve(m_name.length+8);
     str->append(m_name.str, m_name.length);
+    str->append('@');
+    str->qs_append(m_offset);
   }
 
   inline bool send(Protocol *protocol, String *str)