into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667

Logging behavior changed in early 5.1.  (The filename was never right, but
the "opt" file is unnecessary in 5.0 anyway.)


mysql-test/t/mysql_client_test-master.opt:
  Logging behavior changed in early 5.1.

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667


include/my_sys.h:
  Auto merged
mysys/Makefile.am:
  Auto merged
tests/Makefile.am:
  Auto merged

our sprintf()-alike in sync with our fprintf()-alike features.


strings/my_vsnprintf.c:
  Advance the destination pointer properly.
  
  Also, pay attention to the "n" in snprintf() -- never write too much.

This will make charset code easier to understand


include/m_ctype.h:
  Fix spelling in comments
mysql-test/t/cast.test:
  Fix spelling in comments
mysql-test/t/query_cache.test:
  Fix spelling in comments
sql/sql_string.cc:
  Fix spelling in comments
strings/CHARSET_INFO.txt:
  Fix spelling in comments

added I_S.REFARENTIAL_CONSTRAINTS table


mysql-test/r/information_schema.result:
  WL#2257 REFERENTIAL_CONSTRAINTS view
   result fix
mysql-test/r/information_schema_db.result:
  WL#2257 REFERENTIAL_CONSTRAINTS view
   result fix
mysql-test/r/information_schema_inno.result:
  WL#2257 REFERENTIAL_CONSTRAINTS view
   test case
mysql-test/t/information_schema_inno.test:
  WL#2257 REFERENTIAL_CONSTRAINTS view
   test case
sql/ha_innodb.cc:
  WL#2257 REFERENTIAL_CONSTRAINTS view

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667


mysys/Makefile.am:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Bug#17667: An attacker has the opportunity to bypass query logging.

This adds a new, local-only printf format specifier to our *printf functions
that allows us to print known-size buffers that must not be interpreted as 
NUL-terminated "strings."

It uses this format-specifier to print to the log, thus fixing this 
problem.


include/my_sys.h:
  Add prototype for my_memmem() .
mysys/Makefile.am:
  Add reference to new file, my_memmem.c
mysys/mf_iocache2.c:
  Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
  but unlike the string-indicator, it requires the width and doesn't stop printing
  at NUL characters.
  
  Also, simplify the code a bit.
  
  TODO:  This code should be unified with the strings/my_vnsprintf.c code in 
  the future.
sql/sql_parse.cc:
  The query is not a C-string, but is a sized buffer, containing any character 
  at all, which may include NUL characters.
strings/my_vsnprintf.c:
  Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
  but unlike the string-indicator, it requires the width and doesn't stop printing
  at NUL characters.
tests/Makefile.am:
  We may need some of our local functions.
tests/mysql_client_test.c:
  Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
  but unlike the string-indicator, it requires the width and doesn't stop printing
  at NUL characters.
mysql-test/t/mysql_client_test.opt:
  New BitKeeper file ``mysql-test/t/mysql_client_test.opt''
  
  Add '--log' server parameter.
mysys/my_memmem.c:
  New BitKeeper file ``mysys/my_memmem.c''
  
  Implement memmem, a black-box work-alike of the GNU memmem(), which functions
  like strstr() but for arbitrary blocks of memory.

configure.in:
  Auto merged
include/config-win.h:
  Auto merged

mysql-test/t/view_grant.test:
  Fix error name

into  mysql.com:/home/jimw/my/mysql-5.1-clean


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

into  mysql.com:/home/jimw/my/mysql-5.1-clean

include/config-win.h:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.0-clean

  Use "./libtool --mode=execute" to find real path to executables


support-files/mysql.spec.sh:
  Use "./libtool --mode=execute" to find real path to executables

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new


mysql-test/r/null.result:
  Merge case change of "DEFAULT".
sql/sql_table.cc:
  Merged

into mysql.com:/home/hf/work/mysql-5.0.clean

BitKeeper/etc/ignore:
  Added client/mysql_upgrade to the ignore list
client/mysql_upgrade.c:
  fixed for Win build
include/config-win.h:
  fixed for Win build

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0


mysql-test/r/null.result:
  Auto merged
mysql-test/t/null.test:
  Auto merged
sql/sql_table.cc:
  Merge.

config/ac-macros/yassl.m4:
  Fix like of yassl makefiles after merge
mysql-test/lib/mtr_process.pl:
  Re-add line accidently cut out during merge
mysql-test/mysql-test-run.pl:
  Don't start up ndbcluster slave if we don't need it, and fix how
  NDB_STATUS_OK is defined
mysql-test/r/rpl_openssl.result:
  Update results
sql/mysqld.cc:
  Remove duplicate of have_dlopen (bad merge)
sql/set_var.cc:
  Remove duplicate of prepared_stmt_count (bad merge)

into  mysql.com:/home/jimw/my/mysql-5.1-clean


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
  Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
  Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
  Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysql.sln:
  Auto merged
VC++Files/mysql_ia64.dsw:
  Auto merged
client/mysql.cc:
  Auto merged
config/ac-macros/zlib.m4:
  Auto merged
configure.in:
  Auto merged
extra/yassl/Makefile.am:
  Auto merged
extra/yassl/taocrypt/Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.def:
  Auto merged
libmysqld/libmysqld.def:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
client/Makefile.am:
  Resolve conflict
config/ac-macros/yassl.m4:
  Resolve conflict
mysql-test/include/have_udf.inc:
  Resolve conflict
mysql-test/lib/mtr_process.pl:
  Resolve conflict
mysql-test/mysql-test-run.pl:
  Resolve conflict
mysql-test/r/have_udf.require:
  Resolve conflict
mysql-test/r/rpl_openssl.result:
  Resolve conflict
mysql-test/t/disabled.def:
  Resolve conflict
mysql-test/t/information_schema.test:
  Resolve conflict
server-tools/instance-manager/instance_options.cc:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
support-files/mysql.spec.sh:
  Resolve conflict

mysql-test/t/having.test:
  Use error name instead of number

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Resolve conflict
mysql-test/ndb/ndbcluster.sh:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
sql/share/errmsg.txt:
  Resolve conflict

into  zim.(none):/home/brian/mysql/merge-5.1


sql/ha_archive.cc:
  Merge to remove writes. Also removed one unneeded DBUG_PRINT
sql/ha_archive.h:
  Merge

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

  Fix strange "double" define for popen.
  Avoid warnings about sprintf() etc. being unsafe.
  Corrected typo "#endfif"


include/config-win.h:
  Fix strange "double" define for popen.
  Avoid warnings about sprintf() etc. being unsafe.
  Corrected typo "#endfif"

  Changed version to 4.1.20


configure.in:
  Changed version to 4.1.20

  Backport of changes in 5.0 (bug#18294)


support-files/mysql.spec.sh:
  Backport of changes in 5.0 (bug#18294)

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

Now test for NULLness the pointers returned from objects created from the
default value. Pushing patch on behalf of cmiller.


mysql-test/r/null.result:
  Add test case
mysql-test/t/null.test:
  Add test case
sql/sql_table.cc:
  No longer blindly dereference pointer of the string representation of the
  values, where "NULL" is NUL. Raise INVALID DEFAULT error messages where
  appropriate.
  
  Note that the -O1 optimization flag made debugging this extremely tricky, with
  misleading results, and that removing it from the Makefile during debugging can
  be invaluable.

into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0

  Avoid embedding a bunch of whitespace in --help message.


client/mysqlslap.c:
  Avoid embedding a bunch of whitespace in --help message.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  Include and run mysql_upgrade if needed (bug#19353)


support-files/mysql.spec.sh:
  Include and run mysql_upgrade if needed (bug#19353)

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0