mysql-test/lib/mtr_process.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  Manual merge (no idea why automatic merge failed ...).

mysql-test/mysql-test-run.pl:
  Add option "with-ndbcluster-only" (ignored) for compatibility with newer "Do-compile".

mysql-test/lib/mtr_process.pl:
  Auto merged

mysql-test/lib/mtr_process.pl:
  Change from "mtr_error()" to "mtr_warning()" on some problems,
  because "error" makes the whole suite abort which then makes "Do-compile" terminate,
  so none of the following steps (including other etst suites) will be done.

mysql-test/mysql-test-run.sh:
  Manual merge from 4.0 (which was a 5.1 backport):
  "--with-ndbcluster" is already present,
  "--with-ndbcluster-only" is really usable here.

mysql-test/mysql-test-run.sh:
  Make "mysql-test-run.sh" accept (and ignore) the options "--with-ndbcluster" 
  and "--with-ndbcluster-only".
  This is necessary because newer build tools will issue them, and the test 
  script should tolerate that.
  Backport from 5.1 (Tomas Ulin, 2006-01-17)

into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_delete.cc:
  Manual merge

into  mysql.com:/usr/home/bar/mysql-5.1-new

into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0

counter".

When TRUNCATE TABLE was called within an stored procedure the
auto_increment counter was not reset to 0 even if straight
TRUNCATE for this table did this.

This fix makes TRUNCATE in stored procedures to be handled exactly
in the same way as straight TRUNCATE. We achieve this by rolling
back the fix for bug 8850, which is no longer needed since stored
procedures don't require prelocked mode anymore (and TRUNCATE is
not allowed in stored functions or triggers).


mysql-test/r/sp.result:
  Test case for BUG#14945.
mysql-test/t/sp.test:
  Test case for BUG#14945.
sql/sql_delete.cc:
  Handle TRUNCATE in stored procedures exactly in the same way as straight
  TRUNCATE (i.e. without falling back to DELETE if possible). We achieve
  this by rolling back the fix for bug 8850, which is no longer relevant
  since stored procedures don't require prelocked mode anymore
  (and TRUNCATE is not allowed in stored functions or triggers).
sql/sql_parse.cc:
  Handle TRUNCATE in stored procedures exactly in the same way as straight
  TRUNCATE (i.e. without falling back to DELETE if possible). We achieve
  this by rolling back the fix for bug 8850, which is no longer relevant
  since stored procedures don't require prelocked mode anymore
  (and TRUNCATE is not allowed in stored functions or triggers).

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


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
storage/csv/ha_tina.cc:
  SCCS merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

into  mysql.com:/usr/home/bar/mysql-5.1-new


libmysql/libmysql.c:
  Auto merged
sql-common/client.c:
  Auto merged

as it is now required by mysql_set_character_set()


libmysql/libmysql.c:
  Removing mysql_get_server_version()
sql-common/client.c:
  Adding mysql_get_server_version()

into  mysql.com:/usr/home/bar/mysql-5.1-new


libmysql/libmysql.c:
  Auto merged
sql-common/client.c:
  Auto merged

  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.


sql-common/client.c:
  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.

into  mysql.com:/usr/home/bar/mysql-5.0


libmysql/libmysql.c:
  Bug#18830 incompatibility new libraries with old server
  Mergeing from 4.1

into  mysql.com:/home/stewart/Documents/MySQL/5.1/new-bug18831

don't know why this didn't generate a warning, but let's fix it too.


storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  fix reversed memset

storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  fix memset call
  initialize LF_UndoFreeWords(Hi|Lo)

into  mysql.com:/usr/home/bar/mysql-5.1-new


strings/ctype-extra.c:
  Auto merged

  Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.


libmysql/libmysql.c:
  Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.

into  mysql.com:/usr/home/bar/mysql-5.0

Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci


mysql-test/r/ctype_latin1.result:
  Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
mysql-test/t/ctype_latin1.test:
  Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

  Using local.


strings/ctype-extra.c:
  Using local.

into  mysql.com:/usr/home/bar/mysql-5.0


strings/conf_to_src.c:
  Auto merged

  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.


strings/ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.
strings/conf_to_src.c:
  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-5.1-new


strings/ctype-extra.c:
  Auto merged

  Recreating ctype-extra.c with additional 5.1
  charset, and with additional missing 5.0 charset
  due to bug with too small buffer MAX_BUF.


strings/ctype-extra.c:
  Recreating ctype-extra.c with additional 5.1
  charset, and with additional missing 5.0 charset
  due to bug with too small buffer MAX_BUF.

into  mysql.com:/usr/home/bar/mysql-5.1-new

  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.
ctype-extra.c:
  Additional charsets were generated.


strings/ctype-extra.c:
  Additional charsets were generated.
strings/conf_to_src.c:
  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.

into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/share/charsets/Index.xml:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

never defined.
It was used at some point to add -Wuninitialized to debug flags, 
but not any more. If there is still need to add -Wunitialized,
it can be added directly to $global_warnings.


BUILD/compile-amd64-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-amd64-debug-max:
  Remove a no-op.
BUILD/compile-darwin-mwcc:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-pentium-debug-max:
  Remove a no-op.
BUILD/compile-pentium-debug-openssl:
  Remove a no-op.
BUILD/compile-pentium-debug-yassl:
  Remove a no-op.
BUILD/compile-pentium-debug:
  Remove a no-op.
BUILD/compile-pentium-mysqlfs-debug:
  Remove a no-op.
BUILD/compile-pentium-valgrind-max:
  Remove a no-op.
BUILD/compile-pentium64-debug-max:
  Remove a no-op.
BUILD/compile-pentium64-debug:
  Remove a no-op.
BUILD/compile-pentium64-valgrind-max:
  Remove a no-op.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-ppc-debug-max:
  Remove a no-op.
BUILD/compile-ppc-debug:
  Remove a no-op.

into  mysql.com:/home/bk/b18436-mysql-5.1-new

into  mysql.com:/home/bk/b18436-mysql-5.1-new

BUILD/SETUP.sh:
  Remove dead options.
BUILD/compile-amd64-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-amd64-debug-max:
  Remove dead options.
BUILD/compile-amd64-max:
  Remove dead options.
BUILD/compile-darwin-mwcc:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-pentium-debug-max:
  Remove dead options.
BUILD/compile-pentium-icc-valgrind-max:
  Remove dead options.
BUILD/compile-pentium-max:
  Remove dead options.
BUILD/compile-pentium-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-pentium64-debug-max:
  Remove dead options.
BUILD/compile-pentium64-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-ppc-debug-max:
  Remove dead options.
BUILD/compile-ppc-max:
  Remove dead options.