into mysql.com:/usr/home/ram/work/mysql-5.0

mysys/charset.c:
  a fix (bug #10650: Bit literal case sensitivity).
  typo fixed.

ndb/src/common/transporter/TransporterRegistry.cpp:
  fix debug string for TR::report_disconnect

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

sql/field.cc:
  Auto merged

  Added test case for bug #11283.
field.h, field.cc:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.


sql/field.cc:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.
sql/field.h:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.
mysql-test/t/cast.test:
  Added test case for bug #11283.
mysql-test/r/cast.result:
  Added test case for bug #11283.

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


strings/decimal.c:
  Auto merged

mysql-test/r/func_math.result:
  test result fixed
mysql-test/t/func_math.test:
  test case added
strings/decimal.c:
  handling of round_digit changed - we have to check all the digits after
  the point if round_digit is 0

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


strings/decimal.c:
  Auto merged

mysql-test/r/cast.result:
  test result fixed
mysql-test/t/cast.test:
  test case added
sql/item_func.cc:
  checks for NULL added
strings/decimal.c:
  we need to return specified 'scale' for the rounded decimal

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


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

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

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

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

  Added a teast case for bug #11284.
sql_select.cc:
  Fixed bug #11284.
  Optimization with empty inner table currently cannot be
  used in the case of nested outer join.


sql/sql_select.cc:
  Fixed bug #11284.
  Optimization with empty inner table currently cannot be
  used in the case of nested outer join.
mysql-test/t/join_nested.test:
  Added a teast case for bug #11284.

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

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/sql_select.cc:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

  Added a test case for bug #11285.
sql_select.cc:
  Fixed bug #11285.
  The problem occurred with Item_equal in an 'on expression'
  that was evaluated to false.


sql/sql_select.cc:
  Fixed bug #11285.
  The problem occurred with Item_equal in an 'on expression'
  that was evaluated to false.
mysql-test/t/join_outer.test:
  Added a test case for bug #11285.
mysql-test/r/join_outer.result:
  Added a test case for bug #11285.

into mysql.com:/home/timka/mysql/src/5.0-dbg

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

  
When the GROUP BY clause contains a column reference that can be resolved to
both an aliased column in the SELECT list, and to a column in the FROM clause,
the group column is resolved to the column in the FROM clause (for ANSI conformance).
However, it may be so that the user's intent is just the other way around, and he/she
gets the query results grouped by a completely different column than expexted.
This patch adds a warning in such cases that tells the user that there is potential
ambiguity in the group column.

sql/sql_select.cc
- Added a warning when a GROUP column is ambiguous due to that there is a
  column reference with the same name both in the SELECT and FROM clauses.
  In this case we resolve to the column in FROM clause and warn the user
  of a possible ambiguity.
- More extensive comments.
- Changed the function to return bool instead of int (as in other places).

mysql-test/t/group_by.test
  Added test for BUG#11211.

mysql-test/r/group_by.result
  Added test for BUG#11211.


mysql-test/r/group_by.result:
  Import patch 11211.diff
mysql-test/t/group_by.test:
  Import patch 11211.diff
sql/sql_select.cc:
  Import patch 11211.diff
BitKeeper/etc/ignore:
  Added ndb/src/dummy.cpp to the ignore list
mysql-test/r/alias.result:
  Added warning for potentially ambiguous column.
mysql-test/r/having.result:
  Added warning for potentially ambiguous column.

into mysql.com:/home/cps/mysql/trees/mysql-5.0

sql/item.h:
  revrited as recursive
sql/sql_select.cc:
  real_type is virtual
tests/mysql_client_test.c:
  check results abd delete views

into mysql.com:/space/my/mysql-5.0-build


support-files/mysql.spec.sh:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0

into  moonbone.local:/work/mysql-5.0-bug-11111

Wrong method for creating temporary field was choosen, which results in
sending int field with int header but lonlong data.

Test case is added to mysql_client_test.c because client library is required
to test the bug.



tests/mysql_client_test.c:
  Test case for bug#11111 "fetch from view returns wrong data"
sql/sql_select.cc:
  Fix bug #11111 "fetch from view returns wrong data"
sql/item.h:
  Fix bug #11111 "fetch from view returns wrong data"

    Fix for link failures on boxes with non-gnu compiler.
    Fix for compilation failure on hpux11.


extra/yassl/taocrypt/src/misc.cpp:
  Adjust __HP_aCC value to solve compilation problem on hpux11.
tools/Makefile.am:
  Add a dummy C++ file to mysqltestmanager to make libtool use a C++ linker:
  this lets mysqltestmanager link when using yaSSL and a non-gcc C++ compiler.

mysql-test/r/query_cache.result:
  testing cursors in SP with QC
  testing suspicious but working using selects in function with QC
mysql-test/t/query_cache.test:
  testing cursors in SP with QC
  testing suspicious but working using selects in function with QC
sql/sp_head.h:
  method for prohibiting of QC using SP query
sql/sp_rcontext.cc:
  prohibit opening Query cache for SP cursors
sql/sp_rcontext.h:
  constructor moved to .cc file to be able to use methods from lex_keeper

   "--with static" or "--define '_with_static 1'" to the RPM build options. 
   Static linking really only makes sense when linking against the specially patched
   glibc 2.2.5.


support-files/mysql.spec.sh:
   - Do not build statically on i386 by default, only when adding either "--with
     static" or "--define '_with_static 1'" to the RPM build options. Static
     linking really only makes sense when linking against the specially patched
     glibc 2.2.5.

sql/item.cc:
  it's safer not to reassign arg member