into mysql.com:/home/mydev/mysql-4.1-bug6151

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

myisam/myisampack.c:
   - applied portability fix for Windows (1ULL -> ULL(1))

  Correcting problem with merge


sql/sql_acl.cc:
  Correcting problem with merge

into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1

into mysql.com:/home/mydev/mysql-4.1-bug6151

into mysql.com:/media/sda1/mysql/mysql-4.1-6088

mysql-test/r/ps.result:
  Manual merge.

function crashes server" with main tree.

prepared statements when LIMIT is used" and post-review comments.
The fix changes the approach we calculate the need for ORDER BY 
in UNION: the previous was not PS friendly, as it damaged SELECT_LEX 
options in case of single select.


mysql-test/r/ps.result:
  Test results fixed: the test case for Bug#6088
mysql-test/r/subselect.result:
  Test results fixed: now we don't perform ORDER BY for parts of UNION
  if there is no LIMIT clause.
mysql-test/t/ps.test:
  A test case for Bug#6088 "FOUND_ROWS returns wrong values for
   prepared statements when LIMIT is used".
sql/sql_union.cc:
  The actual fix for Bug#6088:
  - don't modify SELECT_LEX'es
  - use boolean variable can_skip_order_by to check if we can skip
    ORDER BY in UNION

  BUG #5831  Post-review changes, merging improvements from Monty.


sql/sql_acl.cc:
  BUG #5831  Post-review changes, merging improvements from Monty.

into mysql.com:/home/dlenev/src/mysql-4.1-bg6081


sql/sql_parse.cc:
  Auto merged

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


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

into mysql.com:/home/dlenev/src/mysql-4.1-tzfix

server" with main tree.


sql/sql_parse.cc:
  Auto merged

sql/item.cc:
  Fix valgrind errors: we need Item::name to point to PS memory
  as well.
sql/item.h:
  set_field no longer can be reused as is for PS purposes.
sql/sql_union.cc:
  Item_field::set_field -> Item_field::reset_field.

client/mysqltest.c:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  merge (use new code)

into mysql.com:/home/dlenev/src/mysql-4.1-tzfix


sql/sql_parse.cc:
  Auto merged

cmd-line-utils/libedit/np/vis.c:
  Fixed a compiler issue for QNX.

into mysql.com:/build/mysqldev/my/mysql-4.1-tomastest


ndb/tools/waiter.cpp:
  Auto merged

into mysql.com:/users/kboortz/daily/work/mysql-4.1-sjis

sql/sql_parse.cc:
  Auto merged

Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)


client/mysql.cc:
  Fix compiler warnings
client/mysqltest.c:
  Fix wrong counting of lines
  Remove compiler warnings
heap/hp_hash.c:
  Fix compiler warnings
innobase/dict/dict0load.c:
  Fix compiler warnings
innobase/include/mem0mem.h:
  Fix compiler warnings
libmysql/client_settings.h:
  Fix compiler warnings
myisam/ft_nlq_search.c:
  Add comments about compiler warnings
myisam/rt_index.c:
  Add comments about compiler warnings
myisam/rt_mbr.c:
  Add comments about compiler warnings
mysql-test/r/ps.result:
  Test case for bug#6094
mysql-test/t/ps.test:
  Test case for bug#6094
mysys/hash.c:
  Fix compiler warnings
mysys/my_handler.c:
  Add comments about compiler warnings
mysys/my_thr_init.c:
  Add comments about compiler warnings
ndb/include/mgmapi/mgmapi.h:
  Fix compiler warnings
regex/main.c:
  Fix compiler warnings
sql/item.h:
  Fix compiler warnings
sql/item_func.h:
  Add comments about compiler warnings
sql/spatial.h:
  Add comments about compiler warnings
sql/sql_lex.h:
  Fix compiler warning
sql/sql_list.h:
  Fix compiler warning
sql/sql_parse.cc:
  Move testing of access rights of tables in CREATE ... SELECT to create_table_precheck() to fix privilege checking in CREATE ... SELECT
  (Bug #6094)
sql/sql_prepare.cc:
  Remove not needed empty line
sql/sql_string.h:
  Fix compiler warnings
strings/ctype-mb.c:
  Fix compiler warnings

crashes server"

(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there).


sql/sql_parse.cc:
  Handling of COM_CREATE_DB, COM_DROP_DB:
  We should call send_error() if mysql_create_db or mysql_drop_db
  return error (like we do it for SQL versions of these commands).

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

ndb/include/kernel/signaldata/UpgradeStartup.hpp:
  Forward declaration
ndb/include/ndb_global.h:
  Fix for AIX
ndb/include/ndb_types.h:
  Always use ndb_global instead of my_global (or anything else)
ndb/include/ndbapi/Ndb.hpp:
  Forward declaration
ndb/include/ndbapi/NdbReceiver.hpp:
  Forward declaration
ndb/include/ndbapi/NdbScanOperation.hpp:
  Forward declaration
ndb/src/common/util/ConfigValues.cpp:
  Always use ndb_global instead of my_global (or anything else)
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Forward declaration
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Move read/update function into Dbtup
ndb/src/mgmsrv/SignalQueue.cpp:
  Always use ndb_global instead of my_global (or anything else)
ndb/tools/waiter.cpp:
  Always use ndb_global instead of my_global (or anything else)

into mysql.com:/home/mydev/mysql-4.1-bug6151

client/mysqltest.c:
  Bug #46Bug#4640 mysql-test-run terminates when the test case includes sjis characters with '5C'

innobase/os/os0file.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged

fixed in the main tree).

into mysql.com:/media/sda1/mysql/mysql-4.1-6050


sql/sql_class.h:
  Auto merged

compilation problems on some platforms'

names with ident. tables fr. diff. schemata": revise all uses of
Item_field and make them prepared-statements friendly when necessary.


mysql-test/r/ps.result:
  Test results fixed: the test case for Bug#6050
mysql-test/r/ps_1general.result:
  Test results fixed: in prepared statements we expand '*' to a list
  of fully qualified fields (db.table.column).
mysql-test/t/ps.test:
  A test for Bug#6050 "EXECUTE stmt reports ambiguous fieldnames with 
  ident. tables fr. diff. schemata"
sql/item.cc:
  Revise all Item_field constructors: we need to make sure that no Item_field
  object points to unaccessible memory in prepared statements.
sql/item.h:
  Revise all Item_field constructors: we need to make sure that no Item_field
  object points to unaccessible memory in prepared statements.
sql/sql_base.cc:
  Item_field use changed to be prepared statements friendly.
sql/sql_class.h:
  New check of Item_arena state.
sql/sql_union.cc:
  Fixing the problem with name resolving in UNION and prepared statements:
  In case of SELECT a, b, c FROM t1 UNION SELECT a, b, c FROM t2 the list of
  selected items is represented as a List<Item_field>, where each 
  Item_field points to a field of temporary table.
  But the temporary table is created anew on each execution of the prepared 
  statement. So on each subsequent execution we should reset Item_field
  items to point to fields from freshly-created temporary table.
sql/table.h:
  Comment TABLE member.

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


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged