into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420


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

fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
ignore my_decimal.cc in libmysqld directory


BitKeeper/etc/ignore:
  Added libmysqld/my_decimal.cc to the ignore list
sql/my_decimal.cc:
  fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
strings/decimal.c:
  fixed C++ syntax in C code

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


mysql-test/r/view.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

BitKeeper/etc/ignore:
  Added client/decimal.c client/my_decimal.cc client/my_decimal.h to the ignore list

Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.


mysql-test/r/information_schema.result:
  Updated result for WL#2130.
mysql-test/r/lock.result:
  Updated result for WL#2130.
mysql-test/r/sp-error.result:
  Updated result for WL#2130.
mysql-test/r/sp.result:
  Updated result for WL#2130.
mysql-test/r/view.result:
  Updated result for WL#2130.
mysql-test/t/information_schema.test:
  Disabled one test case due to a bug involving LOCK TABLES,
  which shows up with WL#2130.
mysql-test/t/lock.test:
  New error message with WL#2130. This change is under debate and might change
  in the future, but will do for now.
mysql-test/t/sp-error.test:
  Updated for WL#2130. Some tests are voided when table access does work from
  functions.
mysql-test/t/sp.test:
  Updated for WL#2130.
mysql-test/t/view.test:
  Updated for WL#2130.
sql/item_func.cc:
  We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
  Reused an error code since the old use was voided by WL#2130, but a new
  one was needed instead (similar, but more specific restriction).
sql/sp.cc:
  Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
  Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
  Added support functions for collecting and merging hash tables and lists
  of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
  Added support functions for collecting and merging hash tables and lists
  of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
  Changed the way table->query_id is tested and set during with locked tables
  in effect. This makes some SP test cases work with WL#2130, but has a side
  effect on some error cases with explicit LOCK TABLES. It's still debated if
  this is the correct way, so it might change.
sql/sql_class.h:
  Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
  Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
  Clear the new hash tables for WL#2130.
sql/sql_lex.h:
  Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
  WL#2130: Make table accesses from stored functions work by adding an implicit
  LOCK TABLES around (most) executed statements. To do this, we have to go through
  a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
  Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
  Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
  Shortcut mysql_make_view() if thd->shortcut_make_view is true during
  the pre-open phase for collecting tables in WL#2130. Otherwise, the
  similar mechanism here causes interference.
sql/sql_yacc.yy:
  For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.

into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420

into hundin.mysql.fi:/home/jan/mysql-5.0

functionality into the test case "strict".

The additional sub test cases are part of the SoW6 test draft
(sow6-dates.test) written by Trudy/PeterG. 

sow6-dates will be no longer needed, because "strict" contains with
this extension all sub test cases of sow6-dates.


mysql-test/r/strict.result:
  Updated results
mysql-test/t/strict.test:
  Additional tests

into mysql.com:/orca/space/pekka/ndb/version/my50

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

ndb/src/common/util/NdbSqlUtil.cpp:
  strnxfrm bug, may not write the length it says
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  fix index in debug print
ndb/test/ndbapi/testOIBasic.cpp:
  do not generate too many mb chars, not checked in TUP

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

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

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


sql/sql_lex.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

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

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

mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/item_cmpfunc.cc:
  manual merge
sql/item_func.cc:
  no changes

mysql-test/include/have_ndb.inc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge

  fixed start-and-exit flag


mysql-test/mysql-test-run.sh:
  fixed start-and-exit flag

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


sql/item.cc:
  Auto merged

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


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

(BUG 8216)


mysql-test/r/group_by.result:
  New test case
mysql-test/r/user_var.result:
  Test changed (to be more correct) with bug fix
mysql-test/t/group_by.test:
  Added test for HAVING bug
sql/item_cmpfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_func.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_row.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_strfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/unireg.h:
  Added PSEUDO_TABLES_BITS for easy testing of real table reference

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967.extra1

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


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

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

  removed typo
  moved pre to post for directory creation
  add changelog comments


support-files/mysql.spec.sh:
  removed typo
  moved pre to post for directory creation
  add changelog comments

sql/slave.cc:
  Ensure that slaves have normal COMMIT behaviour

into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

sql/ha_ndbcluster.cc:
  Added a pthread_exit before thread exists
sql/ha_ndbcluster.h:
  Changed storage of commit_count from uint to ulonglong

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


BUILD/compile-solaris-sparc-purify:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0

  corrected typo


mysql-test/t/ndb_basic.test:
  corrected typo

  Set CCLD as well


BUILD/compile-solaris-sparc-purify:
  Set CCLD as well

into mysql.com:/home/jonas/src/mysql-5.0

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