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

 - 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. 

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

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

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

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

- 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.

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

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

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

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

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

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

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

- 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.

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.)

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

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

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

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

error.

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

changes.

Reset the info after using those files.

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. 

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). 

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

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

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

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

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

  Temporary work around for bug#25359

  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header