sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

When searching column to sort on, item was compared to field under view
column, but not the column itself. Because names of view column and underlaid
field may differ, it leads to possibly choosing wrong column for sorting on.

This patch makes Item_direct_view_ref::eq(Item *item,...) compare
item's name with it's own name proir to comparing to *ref item.


sql/item.cc:
  Fix bug #11709 View was ordered by wrong column
sql/item.h:
  Fix bug #11709 View was ordered by wrong column
mysql-test/t/view.test:
  Test case for bug #11709 View was ordered by wrong column.
mysql-test/r/view.result:
  Test case for bug #11709 View was ordered by wrong column.

into mysql.com:/M50/mysql-5.0

into igor-inspiron.creware.com:/home/igor/mysql-5.0


sql/sql_base.cc:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged

into mysql.com:/M50/mysql-5.0

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

sql/item.cc:
  Auto merged

sql/sql_base.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

New item created in find_field_in_table() to fix view's item, was created 
without taking into account original item's alias. This patch checks if alias 
is set to the original item and if so sets it to newly created item.


sql/sql_base.cc:
  Fix bug#11399 Alias wasn't set on view column
mysql-test/t/view.test:
  Test case for bug#11399 Use an alias in a select statement on a view
mysql-test/r/view.result:
  Test case for bug#11399 Use an alias in a select statement on a view

into mysql.com:/home/psergey/mysql-4.1-bug11821

  MAX(field).


mysql-test/r/subselect.result:
  Testcase for BUG#11821
mysql-test/t/subselect.test:
  Testcase for BUG#11821

into igor-inspiron.creware.com:/home/igor/mysql-5.0

  Added a test case for bug #11771.
item.h:
  Fixed bug #11771.
  Added method reset_query_id_processor to be able to adjust
  query_id for fields generated from * in queries like this:
  SELECT * FROM <view> ...
sql_base.cc:
  Fixed bug #11771.
  Adjusted query_id for fields generated from * in queries
  like this: SELECT * FROM <view> ...


sql/sql_base.cc:
  Fixed bug #11771.
  Adjusted query_id for fields generated from * in queries
  like this: SELECT * FROM <view> ...
sql/item.h:
  Fixed bug #11771.
  Added method reset_query_id_processor to be able to adjust
  query_id for fields generated from * in queries like this:
  SELECT * FROM <view> ...
mysql-test/t/view.test:
  Added a test case for bug #11771.
mysql-test/r/view.result:
  Added a test case for bug #11771.

into deer.(none):/home/hf/work/mysql-5.0.clean

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  Code to check 999.9 -> 1000 case should work always

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


include/my_global.h:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Merge

into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

Added api function mysql_get_character_set_info which provides
information about the current client character set.


include/mysql.h:
  Added api function mysql_get_character_set_info which provides
  information about the current client character set.
libmysql/libmysql.c:
  Added api function mysql_get_character_set_info which provides
  information about the current client character set.
libmysql/libmysql.def:
  Added api function mysql_get_character_set_info which provides
  information about the current client character set.
tests/mysql_client_test.c:
  Added api function mysql_get_character_set_info which provides
  information about the current client character set.

into  mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/etc/config:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
vio/viossl.c:
  Auto merged
VC++Files/tests/mysql_client_test.dsp:
  after merge change
sql/field_conv.cc:
  after merge fix.

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

include/my_global.h:
  Fix for gcc 4.0 (they removed min/max)

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

sql/sql_yacc.yy:
  Added explanation to comment.

into  linux.site:/home/reggie/bk/mysql-5.0

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

into brian-akers-computer.local:/Users/brian/mysql/comment-5.0

Added a test for glibtoolize so that the autoconf tools that come installed on OSX will work fine (so no need to replace them). 


BUILD/autorun.sh:
  Added a test for glibtoolize. This will fix issues with compiling on OSX

cmd-line-utils/libedit/chared.c: Fix compile problem caused by use of "uint" which is undefined on QNX.


cmd-line-utils/libedit/chared.c:
  Re-apply vva's fix:
  cmd-line-utils/libedit/chared.c@1.4, 2004-08-31 17:50:59+05:00, vva@eagle.mysql.r18.ru
    discarded using of uint because it's undefined on qnx

mysql-test/r/system_mysql_db.result:
  Updated result after mysql.proc definition changes.

  Added cast to fix windows compile error


sql/examples/ha_archive.cc:
  Added cast to fix windows compile error

  Identation fix


sql/field_conv.cc:
  Identation fix

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


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  Added cast to bool to fix windows compile problem


sql/sql_insert.cc:
  Added cast to bool to fix windows compile problem

  Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
ctype_utf8.result, ctype_utf8.test:
  adding test case


sql/field_conv.cc:
  Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
mysql-test/t/ctype_utf8.test:
  adding test case
mysql-test/r/ctype_utf8.result:
  adding test caser