sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/select.result:
  SCCS merged
mysql-test/t/select.test:
  SCCS merged

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

ndb/src/mgmsrv/MgmtSrvr.cpp:
  Make sure that node allocating id is allowed to transporter connect

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

into  mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged

functions".

We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.


mysql-test/r/sp.result:
  Added test for bug #12198 "Temporary table aliasing does not work inside stored
  functions" and other tests which cover handling of temporary tables in prelocked
  mode.
mysql-test/t/sp.test:
  Added test for bug #12198 "Temporary table aliasing does not work inside stored
  functions" and other tests which cover handling of temporary tables in prelocked
  mode.
sql/sp_head.cc:
  sp_head::merge_table_list():
    We should ignore alias when we check if table was already marked as temporary
    when we calculate set of tables to be prelocked. Otherwise we will erroneously
    treat tables which are used in same routine and have same name but different
    alias as non-temporary.

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


client/mysqlimport.c:
  Auto merged
include/config-netware.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
netware/mysqld_safe.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Merged from 4.1.
sql/sql_base.cc:
  Merged from 4.1.
sql/sql_handler.cc:
  Merged from 4.1.
sql/sql_select.cc:
  Merged from 4.1.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


include/config-netware.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
netware/mysqld_safe.c:
  Merge from 4.0 to 4.1
sql/mysqld.cc:
  Merge from 4.0 to 4.1

Changes to Netware specific mysqld_safe.c


include/config-netware.h:
  NetWare specific change to increase thread stack size.
innobase/os/os0thread.c:
  NetWare specific change to increase thread stack size.
netware/mysqld_safe.c:
  NetWare specific change to make multiple mysqld_safe instances
  work when called through a NCF file.
sql/mysqld.cc:
  NetWare specific change to increase thread stack size.

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

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

  after-merge fix for
  bug#15581 COALESCE function truncates mutli-byte TINYTEXT values


sql/sql_show.cc:
  after-merge fix for bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
  ,

  After merge fix:
  fixing order of results.


mysql-test/r/ctype_utf8.result:
  After merge fix:
  fixing order of results.

into mysql.com:/home/psergey/mysql-5.0-bug16166-r2

account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)


mysql-test/r/index_merge.result:
  Testcase for BUG#16166
mysql-test/t/index_merge.test:
  Testcase for BUG#16166
sql/sql_select.cc:
  BUG#16166: "Can't use index_merge with FORCE INDEX": adjust the heuristics check:
  if (force-index-is-used && there-is-possible-ref-access && 
  +    THERE IS NO POSSIBLE RANGE/INDEX_MERGE ACCESS)
  {
    ...

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


mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/r/ctype_utf8.result:
  After-merge fix.
sql/field.cc:
  After merge fix.

into  mysql.com:/usr/home/bar/mysql-4.1.b15581

into  mysql.com:/home/alik/MySQL/devel/5.0-bug15103

mysql-test/r/information_schema.result:
  Remove extra spaces from result file.
mysql-test/r/mysqldump.result:
  Remove extra spaces from result file.
mysql-test/r/rpl_ddl.result:
  Remove extra spaces from result file.
mysql-test/r/trigger-compat.result:
  Remove extra spaces from result file.
mysql-test/r/trigger-grant.result:
  Remove extra spaces from result file.
mysql-test/r/trigger.result:
  Remove extra spaces from result file.
sql/sql_yacc.yy:
  Remove leading spaces.

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

include/config-win.h:
  use the ll and ull postfix codes for create longlong and ulonglong
  symbols.  This allows ULL(a) and LL(a) to be used in more complex
  macro definitions than the previous definitions.  This may work on
  other compilers but we just tested on Visual 7.1 and 8.0
  
  Also, define HAVE_STRNLEN for all windows platforms.  Our own strnlen
  offers no performance improvements over the CRT version.

select result

Item equal objects are employed only at the optimize phase. Usually they are not
supposed to be evaluated.  Yet in some cases we call the method val_int() for
them. Here we have to take care of restricting the predicate such an object
represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.

Added a check for field's table being const in Item_equal::val_int().
If the field's table is not const val_int() just skips that field when
evaluating Item_equal.


mysql-test/t/select.test:
  Added test case for bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
mysql-test/r/select.result:
  Added test case for bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
mysql-test/r/func_group.result:
  Corrected test result for bug #12882 after fix for bug#15633
sql/item_cmpfunc.h:
  Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
  Added comment about fields from non-const tables in class description.
sql/item_cmpfunc.cc:
  Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
  Added check for field's table being const in Item_equal::val_int().

into  mysql.com:/opt/local/work/mysql-5.0-root


sql/item_strfunc.cc:
  Auto merged
sql/password.c:
  Manual merge

rename sha1_* to mysql_sha1_*


include/sha1.h:
  rename sha1_* to mysql_sha1_*
mysys/sha1.c:
  rename sha1_* to mysql_sha1_*
sql/item_strfunc.cc:
  rename sha1_* to mysql_sha1_*
sql/password.c:
  rename sha1_* to mysql_sha1_*

into  mysql.com:/usr/local/mysql/tmpbuild

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

client/mysqltest.c:
  Add comments
  Group inits logically

Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.


client/mysqltest.c:
  Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
mysql-test/r/mysqltest.result:
  Correct test result, "At line 1" should be printed

into  mysql.com:/usr/local/mysql/mysql-5.0

client/mysqltest.c:
  Disable "let" assign each column of query to own var
mysql-test/r/mysqltest.result:
  Remove test results for disabled test
mysql-test/t/mysqltest.test:
  Disable test for "let assigns each column of query to own var"

into  mysql.com:/home/alik/MySQL/devel/5.0-bug15110


sql/sql_parse.cc:
  Auto merged

There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.


BitKeeper/etc/ignore:
  added client/my_user.c libmysqld/my_user.c sql/my_user.c
client/Makefile.am:
  Use my_user.c in linking of mysqldump executable.
client/mysqldump.c:
  Fix for BUG#15110(mysqldump --triggers: does not include DEFINER clause)
include/Makefile.am:
  Add my_user.c
include/mysql_com.h:
  Introduce a constant for max user length.
libmysqld/Makefile.am:
  Add my_user.c
mysql-test/r/mysqldump.result:
  Update result file.
sql-common/Makefile.am:
  Add my_user.c
sql/Makefile.am:
  Add my_user.c
sql/sp.cc:
  Use constant for max user length.
sql/sp_head.cc:
  Use common function to parse user value.
sql/sql_acl.cc:
  Use constant for max user length.
sql/sql_parse.cc:
  Use constant for max user length.
sql/sql_show.cc:
  Use constant for max user length.
sql/sql_trigger.cc:
  Use constant for max user length.
include/my_user.h:
  A header file for parse_user().
sql-common/my_user.c:
  A new file for parse_user() implementation.

into  mysql.com:/nfstmp1/ingo/autopush-773/mysql-5.0