When view column aliased in subselect alias is set on ref which represents
field. When tmp table is created for subselect, it takes name of original field
not ref. Because of this alias on view column in subselect is lost. Which
results in reported error.

Now when alias is set on ref, it's set on ref real item too.


mysql-test/r/view.result:
  Test case for bug #12993  View column rename broken in subselect
mysql-test/t/view.test:
  Test case for bug #12993  View column rename broken in subselect
sql/sql_base.cc:
  Fix bug #12993 View column rename broken in subselect
  Now when alias is set on ref, it's set on ref real item too.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

  Fix some comments.


extra/comp_err.c:
  Fix some comments.

into mysql.com:/home/psergey/mysql-5.0-merge

mysql-test/r/mysqldump.result:
  BUG #12597 - new results file because of merge of test and results file

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  resolving conflicts in order to push for bug #12597
mysql-test/t/mysqldump.test:
  resolving conflicts for pushing to bug #12597

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594

into mysql.com:/home/psergey/mysql-5.0-merge

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056

into  mysql.com:/home/alexi/dev/mysql-5.0-12101


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-merge

thd->user_var_events_alloc (and so get binlog events to be allocated on its pool), 
clean the binlog events after the execution of this SP statement is finished.

into  mysql.com:/home/alexi/dev/mysql-5.0-12101


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

sql/item_cmpfunc.cc:
  Modified Item_func_between::print(), Item_func_in::print().
  Item_func_between/in objects represent now [NOT]BETWEEN/IN expressions.

into mysql.com:/home/gluh/MySQL/Merge/5.0

tests/mysql_client_test.c:
  Auto merged

into lmy004.:/work/mysql-5.0-bug12651

into mysql.com:/home/psergey/mysql-5.0-merge


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

into lmy004.:/work/mysql-5.0-bug12651

   This fix is cancellation of ChangeSet
   1.2329 05/07/12 08:35:30 reggie@linux.site +8 -0
   Bug 7142  Show Fields from fails using Borland's dbExpress interface
   The reason is we can't fix bug#7142 without
   breaking of existing applications/APIs that worked fine with earlier 4.1
   bug 7142 is fixed in 5.0




mysql-test/r/ps_1general.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_2myisam.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_3innodb.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_4heap.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_5merge.result:
  Bug #12817 SHOW STATUS now blob fields
sql/item.cc:
  Bug #12817 SHOW STATUS now blob fields
sql/sql_show.cc:
  Bug #12817 SHOW STATUS now blob fields
tests/mysql_client_test.c:
  Bug #12817 SHOW STATUS now blob fields

client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into lmy004.:/work/mysql-5.0-bug12651

sql/item_cmpfunc.h:
  Auto merged

into lmy004.:/work/mysql-5.0-bug12651


sql/sql_base.cc:
  Auto merged

client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0