into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0

into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0


sql/sql_acl.cc:
  Auto merged

 Make innodb_thread_concurrency 0 by default, and extend the usable
 range from 0 to 1000 (0 disables the thread throttling).


innobase/include/srv0srv.h:
  Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
innobase/srv/srv0srv.c:
  Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
mysql-test/r/innodb.result:
  innodb_thread_concurrency is 0..1000 now, and the default is 0.
mysql-test/t/innodb.test:
  innodb_thread_concurrency is 0..1000 now.
sql/ha_innodb.cc:
  Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.
sql/mysqld.cc:
  innodb_thread_concurrency is 0..1000 now, and 0 (the default)
   disables the thread throttling.

 Make innodb_flush_log_at_trx_commit a settable global variable.


innobase/include/srv0srv.h:
  Change the type of srv_flush_log_at_trx_commit.
innobase/srv/srv0srv.c:
  Change the type of srv_flush_log_at_trx_commit.
sql/ha_innodb.cc:
  Remove innobase_flush_log_at_trx_commit.
   (Set srv_flush_log_at_trx_commit directly).
sql/ha_innodb.h:
  Remove innobase_flush_log_at_trx_commit.
   (Set srv_flush_log_at_trx_commit directly).
sql/mysqld.cc:
  Bypass the variable innobase innobase_flush_log_at_trx_commit.
sql/set_var.cc:
  Make innodb_flush_log_at_trx_commit a settable global variable.

into mysql.com:/M50/merge-5.0

into mysql.com:/M50/merge-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

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

reword the misleading message.


mysql-test/r/sp-error.result:
  Test results fixed (Bug#15206)
mysql-test/r/sp.result:
  Test results fixed (Bug#15206)
mysql-test/r/type_decimal.result:
  Disable an unportable test case (Bug#7670)
mysql-test/r/variables.result:
  Test results fixed (Bug#15206)
mysql-test/r/view_grant.result:
  Test results fixed (Bug#15206)
mysql-test/t/type_decimal.test:
  Remove an unportable (QNX) test case (Bug#7670). The test output
  depends on system-specific sprintf() implementation.
  The original complain was about erroneous conversion to long long,
  which was applied prior to conversion to double: but the expected
  behaviour can't be achieved until we have an own string -> double
  conversion function.

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

client/mysqltest.c:
  If connection suceeded don't close it, just call handle_no_error which will check if an error was expected
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Add test for connection not being added to connection pool if "disable_abort_on_error" was used

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_handler.cc:
  Auto merged

into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0

sql/sp_rcontext.cc:
  Post-review fix.

into  hundin.mysql.fi:/home/jani/mysql-5.0

into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0


mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.

into mysql.com:/M50/merge-5.0

into  hundin.mysql.fi:/home/jani/mysql-5.0

into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


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

into  hundin.mysql.fi:/home/jani/mysql-5.0

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged
mysql-test/t/ps.test:
  SCCS merged

into  mysql.com:/opt/local/work/mysql-4.1-root

mysql-test/r/ctype_ucs.result:
  Test results changed (Bug#13337)
mysql-test/r/ps.result:
  Test results changed (Bug#13337)
mysql-test/t/ctype_ucs.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)
mysql-test/t/ps.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)

into  mysql.com:/opt/local/work/mysql-5.0-root


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

mysql-test/r/alter_table.result:
  Test results fixed (Bug#6073)
mysql-test/t/alter_table.test:
  A test case for Bug#6073

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


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

values stored into DOUBLE column" (Can't repeat)


mysql-test/r/type_decimal.result:
  Test results fixed (Bug#7670)
mysql-test/t/type_decimal.test:
  A test case for Bug#7670

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


client/mysqldump.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

mysql-test/r/sp-code.result:
  Post-merge fix; updated result.
mysql-test/t/sp.test:
  Post-merge fix; added comment (still can't call bug14498_4 test)

extra/comp_err.c:
  Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).

into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554

Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi


scripts/mysqld_multi.sh:
  Auto merged
extra/comp_err.c:
  Manual merge: From 4.1 to 5.0, the license line was moved to a different place.

mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  SCCS merged

into  mysql.com:/usr/local/mysql/mysql-5.0-win-test-fixes


mysql-test/mysql-test-run.pl:
  Manual merge.

into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0


sql/sp_head.h:
  Auto merged
sql/sp_pcontext.h:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/sp_head.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.