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


mysql-test/r/fulltext.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/table.cc:
  Auto merged

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441

  Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1


sql/table.cc:
  Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441


sql/item_func.cc:
  Auto merged
sql/item_sum.h:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

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

    changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp
    some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp
    rewrote parsing on parseNameValuePair, was buggy


ndb/src/common/logger/LogHandler.cpp:
  changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp:
  some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  rewrote parsing on parseNameValuePair, was buggy

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

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


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Scan number allocation must be on table even in case of range scan
  Otherwise scan takeover won't work as LQHKEYREQ contains table

do not leave sql command uninitialized, because it used for detection need of preparation correct idends printing  during finding identifiers i


sql/sql_lex.h:
  do not leave sql command uninitialized, because it used for detection need of preparation correct idends printing  during finding identifiers in table list (alias resolving tracking)

sql/mysqld.cc:
  spelling fixed
sql/sql_base.cc:
  spelling fixed
sql/sql_delete.cc:
  spelling fixed
sql/sql_parse.cc:
  comments added
sql/sql_prepare.cc:
  comments added
sql/sql_update.cc:
  spelling fixed
sql/sql_view.cc:
  spelling fixed
sql/table.cc:
  spelling fixed

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


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged

mysql-test/r/view.result:
  changes in error number, and key in view processing
mysql-test/t/view.test:
  changes in error number, and key in view processing
sql/mysql_priv.h:
  changes functions
sql/sp.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_base.cc:
  fixed finding table, taking in account join view, which can have not TABLE pointer
  now we report to setup_tables(), are we setuping SELECT...INSERT and ennumerete insert table separately
sql/sql_delete.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_help.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_insert.cc:
  fixed returning value of functions
sql/sql_load.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
  removed second setup_tables call (merge)
sql/sql_olap.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_parse.cc:
  UPDATE->MULTIUPDATE switching fixed
sql/sql_prepare.cc:
  UPDATE->MULTIUPDATE switching fixed
sql/sql_select.cc:
  now we report to setup_tables(), are we setuping SELECT...INSERT
sql/sql_update.cc:
  UPDATE->MULTIUPDATE switching fixed
sql/sql_view.cc:
  returning value fixed
sql/sql_view.h:
  returning value fixed

into mysql.com:/home/mysql_src/mysql-5.0-clean

  my_message_sql does not tolerate a NullS argument (segfault)


sql/sql_select.cc:
  my_message_sql does not tolerate a NullS argument (segfault)

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos

  Correct InnoDB's result output in test; the pseudo-file-extension for InnoDB tables '.InnoDB' was replaced by a more realistic '.ibd' extension


mysql-test/r/lowercase_table3.result:
  Correct InnoDB's result output in test; the pseudo-file-extension for InnoDB tables '.InnoDB' was replaced by a more realistic '.ibd' extension

into avenger.(none):/export/brian/mysql/merge/5.0

Build-tools/Do-compile:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Resolved NDB conflict between 4.1 and 5.0

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

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


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/table.h:
  Auto merged

correct printing of aliases


mysql-test/r/lowercase_view.result:
  aliases in VIEWs
mysql-test/t/lowercase_view.test:
  aliases in VIEWs
sql/item.cc:
  tracking using aliases in indentifiers
sql/item.h:
  tracking using aliases in indentifiers
sql/sql_base.cc:
  tracking using aliases in indentifiers
sql/sql_lex.cc:
  tracking using aliases in indentifiers
sql/sql_lex.h:
  tracking using aliases in indentifiers
sql/table.h:
  tracking using aliases in indentifiers

  Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system


innobase/configure.in:
  Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system

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

client/mysqladmin.cc:
  Auto merged
Build-tools/Do-compile:
  Merged the default "--force" for the call to 'mysql-test-run' from 4.0, for immediate use in the current 5.0 builds.

'information_schema' test is splitted because of innodb  


mysql-test/r/information_schema.result:
  Test is splitted because of innodb
mysql-test/t/information_schema.test:
  Test is splitted because of innodb
sql/sql_show.cc:
  Fixed bug related to lower case table names on Power Mac
sql/table.h:
  Fixed bug related to lower case table names on Power Mac
tests/client_test.c:
  Don't check field length for blob filed

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

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

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


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged

Queue scan on real fragment.
  Index fragment for range scans
  Table fragment for table scans


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Document meaning of fragPtrI and how it differs
    from scanTcRec->fragmentptr
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Queue scan on real fragment.
    Index fragment for range scans
    Table fragment for table scans
ndb/src/ndbapi/NdbConnection.cpp:
  Check tOp before assigning

client/mysqladmin.cc:
  Auto merged

client/mysqladmin.c:
  Cast to overcome a C vs. C++ signature problem, occurring in 5.0 where this is a C++ file.