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)

compilation problems on some platforms'

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


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

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

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

  Bug#6167 One element missing in 'uc_update_queries[]'


sql/sql_parse.cc:
  Bug#6167 One element missing in 'uc_update_queries[]'

into hundin.mysql.fi:/home/jan/talle/mysql-4.1

this timestamp might not be the correct time because e.g. ALTER TABLE
changes this timestamp.


sql/ha_innodb.cc:
  Do not show check_time and update_time because we do not really know them.
  UPDATE, INSERT and CHECK TABLE do not change these timestamps.

  Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
  new file


mysql-test/t/mysqltest.test:
  Added SQLSTATE matching support to test engine
mysql-test/r/mysqltest.result:
  Added SQLSTATE matching support to test engine
client/mysqltest.c:
  Added SQLSTATE matching support to test engine

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

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

some platforms provide posix snprintf via special defined, these defines however cause problems elsewhere
so this is a way to only have to do this define in one file

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

into mysql.com:/M41/mysql-4.1

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

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

sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Manual merge

positive numbers when no resultset is available": when sending
result set metadata we need to use virtual select_result::send_fields, 
and not address protocol directly, because select_result descendents may 
intercept result set (it's the case for example for SELECT INTO OUTFILE).


sql/sql_class.h:
  A fix for bug#6059 "mysql_stmt_field_count returns positive numbers 
  when no resultset is available": introducing select_result::field_count()
  method to report actual number of fields in a result set, if any result
  set is sent to client.
sql/sql_prepare.cc:
  A fix for bug#6059 "mysql_stmt_field_count returns 
  positive numbers when no resultset is available": when sending
  result set metadata we need to use virtual select_result::send_fields, 
  and not address protocol directly, because select_result descendents may 
  intercept result set (it's the case for example for SELECT INTO OUTFILE).
  Now we need to always have lex->result set if we're in prepared statements.
tests/client_test.c:
  A test case for Bug#6059 "mysql_stmt_field_count returns positive 
  numbers when no resultset is available"

  Optimization: move "space padding" code outside the loop


strings/ctype-uca.c:
  Optimization: move "space padding" code outside the loop

It also did not write ~/.mysql_history file. The problem was in alloc(),
which probably does not work on HP-UX-11.23 ia64 platform. Changed some
macros into functions for better maintenance and debugging.

mysql-test/r/ps_10nestset.result:
  Correct the expected protocol according to the test changes.
mysql-test/t/ps_10nestset.test:
  Improve comments;  adapt to standard test style:
  disable warnings around 'drop table', use 't#' table name scheme.
mysql-test/t/ps_11bugs.test:
  Corrected a typing error in the bug number comment.

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

for InnoDB tables. Note that these times may always be correct ones,
because for example ALTER TABLE creates a table again.



innobase/include/os0file.h:
  Added information of file timestamps and a function os_file_get_status
  to get that information using stat().
innobase/os/os0file.c:
  Added function that return information obout the specified file.
sql/ha_innodb.cc:
  Get timestamps for the file where the table is stored.

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


ndb/src/mgmsrv/Services.cpp:
  Auto merged

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

provite declarations for signal print functions, needed on some platforms
ome platforms don't like the length calculation for SignalDataPrintFunction
    so null terminate instead
ome platforms complain about this extra level Logger::Logger::
 null terminate SignalDataPrintFunctions instead
    move declaration of print function to SignalData.hpp
  just change from "" to <> in include
 moved double declatration of i out



ndb/include/kernel/signaldata/DihContinueB.hpp:
  changed to same signature as rest of print functions
ndb/include/kernel/signaldata/NdbfsContinueB.hpp:
  changed to same signature as rest of print functions
ndb/include/kernel/signaldata/SignalData.hpp:
  provite declarations for signal print functions, needed on some platforms
ndb/src/common/debugger/DebuggerNames.cpp:
  some platforms don't like the length calculation for SignalDataPrintFunction
  so null terminate instead
ndb/src/common/debugger/EventLogger.cpp:
  some platforms complain about this extra level Logger::Logger::
ndb/src/common/debugger/signaldata/ContinueB.cpp:
  changed to same signature as rest of print functions
ndb/src/common/debugger/signaldata/DihContinueB.cpp:
  changed to same signature as rest of print functions
ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp:
  changed to same signature as rest of print functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  null terminate SignalDataPrintFunctions instead
  move declaration of print function to SignalData.hpp
ndb/src/common/portlib/NdbSleep.c:
  just change from "" to <> in include
ndb/src/mgmsrv/Services.cpp:
  moved double declatration of i out

ndb/src/mgmsrv/ConfigInfo.cpp:
  Better cast
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add default arg
sql/ha_ndbcluster.cc:
  reorder methods, so that they are not used prior to declaration
  (inlines)

  Typo.


strings/CHARSET_INFO.txt:
  Typo.

  New comments about ctype[].


strings/CHARSET_INFO.txt:
  New comments about ctype[].

  Forgot to commit in the previous changeset


mysql-test/r/ctype_uca.result:
  Forgot to commit in the previous changeset