into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  SCCS merged

 - Always reset error when calling mysql_stmt_prepare a second time
 - Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server.
 - Add test to mysql_client_test
 - Remove mysql_stmt_close in mysqltest after each query
 - Close all open statements in mysqltest if disable_ps_protocol is called. 


client/mysqltest.c:
  Don't close the statement after each query - reprepare it in next query.
  When "disable_ps_protocol" is issued make sure to close all open
  statements. Otherwise the test for @@max_prepared_statements fails. But we
  also get a test that the statements that are open can be closed and reopened
  in the middle of the tests.
libmysql/libmysql.c:
  Reset the last error every time mysql_stmt_prepare is called.
  Set state to MYSQL_STMT_INIT_DONE befoe closing it in the server. That way
  we will always have right status regardless of wheter close fails or not.
tests/mysql_client_test.c:
  Add testcase for bug15518, re-prepare a previously prepare statement that has failed
  to prepare. Test also when connection to server has been lost inbetween.
  Change all assert to DIE_UNLESS so we get printout of line and an error message
  if it fails.

Abandon attempt to only use one for some tests that don't use the second master


mysql-test/lib/mtr_cases.pl:
  Always use two masters for ndb tests

Cset exclude: cmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa|ChangeSet|20070111195403|30218


mysql-test/include/have_ndb.inc:
  Exclude

into  recycle.(none):/src/mysql-5.1-maint


BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged

into  recycle.(none):/src/bug19424/my51-bug19424


BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Null Merge.

- Re-enabling optimization on all except innodb/mem/*.

into  mysql.com:/home/tnurnberg/work/mysql-5.1-maint-24660

readonly seems like a good idea, but the test suite isn't expecting those
statements in some places.

Figure out how we want to use this code later.


mysql-test/include/have_ndb.inc:
  Revert to old behavior.

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint


mysys/mf_iocache.c:
  Auto merged

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint


Makefile.am:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql.h:
  Auto merged
include/typelib.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
mysys/my_wincond.c:
  Auto merged
mysys/typelib.c:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/share/charsets/hebrew.xml:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/conf_to_src.c:
  Auto merged
vio/viossl.c:
  Auto merged

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint


mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  null merge

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  Auto merged

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


mysys/mf_iocache.c:
  Auto merged

into  naruto.:C:/cpp/bug24751/my51-bug24751


mysys/mf_iocache.c:
  Auto merged

into  naruto.:C:/cpp/bug24751/my50-bug24751


mysys/mf_iocache.c:
  Auto merged

- When cache memory can't be allocated size is recaclulated using 3/4 of
  the requested memory. This number is rounded up to the nearest 
  min_cache step. 
  However with the previous implementation the new cache size might
  become bigger than requested because of this rounding and thus we get
  an infinit loop.
- This patch fixes this problem by ensuring that the new cache size
  always will be smaller on the second and subsequent iterations until
  we reach min_cache.


mysys/mf_iocache.c:
  - Added mask to cachesize to ensure that algorithm always produce a 
    smaller cache size than current, until we reach 'min_cache' size.

ENUMs weren't allowed to have character 0xff, a perfectly good character in many locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used (because they too would get converted to 0xff on load). Now if 0xff makes an
appearance, we find a character not used in the enum and use that as a separator. If no
such character exists, we throw an error.

Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.

(port of the original 4.1 patch. incorporates some suggestions by kaamos.)


mysql-test/r/type_enum.result:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
mysql-test/t/type_enum.test:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
sql/table.cc:
  Bug#24660: "enum" field type definition problem
  
  Revert fix for Bug#20922.
sql/unireg.cc:
  Bug#24660: "enum" field type definition problem
  
  Use a field-separator for ENUM-values that is not part of those values. If impossible,
  throw error.

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint

into  kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010


mysys/mf_iocache.c:
  Auto merged
mysys/my_seek.c:
  SCCS merged

into  kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010


mysys/mf_iocache.c:
  Auto merged
mysys/my_seek.c:
  Auto merged

into  kpdesk.mysql.com:/home/thek/dev/bug23010/my41-fix23010


mysys/mf_iocache.c:
  Auto merged
mysys/my_seek.c:
  Auto merged

mysys/mf_iocache.c:
  Exclude
mysys/my_seek.c:
  Exclude

error.


BUILD/SETUP.sh:
  Use POSIX "=" equality shell test.
mysql-test/r/view.result:
  Revert year drift.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener


Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqlbug.sh:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
mysql-test/r/warnings.result:
  Manual merge.
mysql-test/t/warnings.test:
  Manual merge.
strings/ctype-extra.c:
  Manual merge.

changes.

Reset the info after using those files.


mysql-test/t/ndb_binlog_ignore_db.test:
  Reset the binlog after we include several files that have little 
  to do with this test.

mysql-test/t/warnings-master.opt:
  Added skip-innodb option (which was what it once was...)
mysql-test/t/warnings.test:
  Removed un-needed variable setting. Bug only had to do with unterimated string.

Cleaning up warning for windows. Innodb is compiled but disable on Windows, so it should be fine. NDB wasn't compiled in, which is what caused the issue. 


mysql-test/r/warnings.result:
  Modified warning to work with Windows
mysql-test/t/warnings.test:
  Moved warning to use Innodb.

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

The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space). 


mysql-test/r/csv.result:
  Fixed test case for format change. Added new test for floating point numbers.
mysql-test/t/csv.test:
  Fixed test for format change. Added test case for floating point numbers.
storage/csv/ha_tina.cc:
  Updated code to handle numbers as raw unquotes types in CSV

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


storage/csv/CMakeLists.txt:
  Auto merged
storage/csv/Makefile.am:
  Auto merged

Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better. 


storage/csv/transparent_file.cc:
  BitKeeper file /home/brian/mysql/merge-5.1/storage/csv/transparent_file.cc
storage/csv/transparent_file.h:
  BitKeeper file /home/brian/mysql/merge-5.1/storage/csv/transparent_file.h
storage/csv/CMakeLists.txt:
  Updated for windows
storage/csv/Makefile.am:
  Updated to add new class
storage/csv/ha_tina.cc:
  Removed hidden class
storage/csv/ha_tina.h:
  Remove hidden class

into  trift2.:/MySQL/M51/mysql-5.1

    Delete compiler-specific flag setting - it makes builds break.


server-tools/instance-manager/Makefile.am:
  Delete compiler-specific flag setting - it makes builds break.
  If this is really wanted, it must be done through "configure", caring about the compiler differences.

into  mysql.com:/home/kent/bk/main/mysql-5.1


mysql-test/r/view.result:
  Auto merged