into  pilot.blaudden:/home/msvensson/mysql/bug19410/my51-bug19410


client/mysqltest.c:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410


client/mysqltest.c:
  Auto merged

- Use "mysql_stmt_field_count" to determine if there is a need to
call "mysql_stmt_store_result"


client/mysqltest.c:
  Only call 'mysql_stmt_store_result' if 'mysql_stmt_field_count' is
  greater than 0 indicating that this query has a result set.
  This change is mainly since if mysql_stmt_store_result fails
  the value returned by mysql_stmt_field_count will be reset.

 - my_time_t is defined as long which means it will not always be the
same size as time_t. See explanation in include/my_time.h


sql/event_queue.cc:
  No need to require that "sizeof(time_t) == sizeof(my_time_t)"

into  pilot.blaudden:/home/msvensson/mysql/bug26678/my51-bug26678

 - Import a patch from yaSSL CVS that uses "word" instead
of "unsigned long" in three function's that uses sizeof to find
out the word size being used. NOTE! long is 32 bit also on 
64 bit windows.


extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Use local

into temporary table and selecting the correct row with SQL

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/trigger-grant.test:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


extra/comp_err.c:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

200 allowing it to print paths a little better

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

 - Fixes for 5.1
 - Always use long for my_time_t


include/my_time.h:
  Use long for my_time_t
  It should be signed and hold seconds for 1902 -- 2038-01-19 range
  i.e at least a 32bit variable
  
  Using the system built in time_t is not an option as
  we rely on the above requirements in the time functions
  
  For example QNX has an unsigned time_t type

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
extra/comp_err.c:
  Manual merge

into  pilot.blaudden:/home/msvensson/mysql/bug26536/my51-bug26536


include/my_time.h:
  Auto merged
sql/tztime.cc:
  Auto merged

 - Avoid overflow in sec_since_epoch by shifting the time
   back 2 days for times close to the maximum range of my_time_t
 - Improve comment about why we need my_time_t
 - Patch will also fix timezone2.test


include/my_time.h:
  Improve comment for my_time_t, especially that we require
  it to be at least a 32bit unsigned type
sql/tztime.cc:
  - Add assert in sec_since_epoch to guard it against broken down time
  values that would cause overflow in my_time_t on systems with 32 bit
  my_time_t
  - Avoid overflow in sec_since_epoch by "shifting" the broken down
  time back 2 days for times that are near the max value.c

into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


BitKeeper/deleted/.del-CMakeLists.txt~10:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum


sql/share/errmsg.txt:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


sql/share/errmsg.txt:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


sql/share/errmsg.txt:
  Auto merged

sql/share/errmsg.txt:
  Add the missing "d"

into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


extra/Makefile.am:
  Auto merged
sql/share/errmsg.txt:
  Use local errmsg.txt
extra/comp_err.c:
  Manual merge

- Add check of format specifiers in error message strings
- Update error message text accordingly to be equal between all translations


extra/Makefile.am:
  comp_err uses my_cheksum, link with zlib
extra/comp_err.c:
  Add check of format specifiers in error message strings
sql/share/errmsg.txt:
  Update error messages after checks
  ---
  Remove the newly added space in error message, should not be there

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

Force the server restart before running mysqlbinlog-cp932.test to fix PB failures introduced by the patch for bug #18743.


mysql-test/t/mysqlbinlog-cp932-master.opt:
  New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932-master.opt''

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

This is for bug #18743.


mysql-test/t/mysql.test:
  Moved the test requiring cp932 to a separate unit
mysql-test/r/mysql_cp932.result:
  Moved the test requiring cp932 to a separate unit
mysql-test/t/mysql_cp932.test:
  Moved the test requiring cp932 to a separate unit

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint

into  naruto.:C:/cpp/mysql-5.1-maint


mysys/my_wincond.c:
  Auto merged
include/my_pthread.h:
  SCCS merged

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Manual merge