Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/home/my/mysql-5.0

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/item_row.h b/sql/item_row.h
index bd47558a2f6..8623b579e33 100644
--- a/sql/item_row.h
+++ b/sql/item_row.h
@@ -71,7 +71,7 @@ public:
   Item *transform(Item_transformer transformer, byte *arg);
 
   uint cols() { return arg_count; }
-  Item* el(uint i) { return items[i]; }
+  Item* element_index(uint i) { return items[i]; }
   Item** addr(uint i) { return items + i; }
   bool check_cols(uint c);
   bool null_inside() { return with_null; };