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


mysql-test/t/information_schema.test:
  Auto merged

sql/slave.cc:
  Read rli->events_till_abort to a temporary variable before unlocking the mutex

sql/slave.cc:
  Exclude

mysql-test/t/wait_timeout.test:
  Remove sleeps from wait_timeout in order to make it timing independent.
  Instead get the status variable "aborted_clients" in a seconds connection.

into  mysql.com:/usr/local/mysql/mysql-5.0

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


sql/mysqld.cc:
  Auto merged

transfer NO_DEFAULT_VALUE_FLAG flag to new field


mysql-test/r/strict.result:
  Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
  test case
mysql-test/r/type_ranges.result:
  Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
  result fix
mysql-test/t/strict.test:
  Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
  test case

 - Unlock the mutex after looking at rli->events_till_abort
 - Already fixed in 5.1 so it will be null merged.


sql/slave.cc:
  Unlock the mutex after looking at rli->events_till_abort

show view definition to users that have the needed privilleges


mysql-test/r/information_schema.result:
  Bug#16681 information_schema shows forbidden VIEW details
  test case
mysql-test/t/information_schema.test:
  Bug#16681 information_schema shows forbidden VIEW details
  test case

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

into  mysql.com:/home/kgeorge/mysql/5.0/B18745

BUILD/compile-pentium-gcov:
  Add -max options for gcov, fix yassl and BDB builds, disable ccache which
  is incompatible with gcc profiling output.

mysql-test/r/view.result:
  Post-review fixes.
sql/field.cc:
  Post-review fixes.
sql/field.h:
  Post-review fixes.
sql/sql_select.cc:
  Post-review fixes.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

Moved the InnoDB related test from func_group.test to innodb_mysql.test


mysql-test/r/func_group.result:
  Moved a test to innodb_mysql
mysql-test/r/innodb_mysql.result:
  moved a test to innodb_mysql
mysql-test/t/func_group.test:
  Moved a test to innodb_mysql
mysql-test/t/innodb_mysql.test:
  Moved a test to innodb_mysql

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

mysql-test/r/ndb_blob.result:
  bug#19956 : var* pk
mysql-test/t/ndb_blob.test:
  bug#19956 : var* pk
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  bug#19956 - check var* length bytes and zero rest of value if any blob attribute
ndb/src/ndbapi/NdbOperationSearch.cpp:
  bug#19956 - check var* length bytes and zero rest of value if any blob attribute

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


sql/sql_select.cc:
  Auto merged
mysql-test/r/view.result:
  Manual merge
mysql-test/t/view.test:
  Manual merge

When a CREATE TABLE command created a table from a materialized
view id does not inherit default values from the underlying table.
Moreover the temporary table used for the view materialization
does not inherit those default values.
In the case when the underlying table contained ENUM fields it caused
misleading error messages. In other cases the created table contained
wrong default values.
The code was modified to ensure inheritance of default values for
materialized views.


mysql-test/r/view.result:
  Added a test case for bug #19089.
mysql-test/t/view.test:
  Added a test case for bug #19089.
sql/field.cc:
  Fixed bug ##19089.
  Added field dflt_field to the class Field.
  This field is set for temp table fields that inherits
  default values of items from which they are created.
sql/field.h:
  Fixed bug ##19089.
  Added field dflt_field to the class Field.
  This field is set for temp table fields that inherits
  default values of items from which they are created.
sql/sql_select.cc:
  Fixed bug #19089.
  When a CREATE TABLE command created a table from a materialized
  view id does not inherit default values from the underlying table.
  Moreover the temporary table used for the view materialization
  does not inherit those default values.
  The code was modified to ensure inheritance of default values for
  materialized views.

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

support-files/mysql.spec.sh:
  SCCS merged

  Always compile position independent


support-files/mysql.spec.sh:
  Always compile position independent

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


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
include/sslopt-longopts.h:
  Resolve conflict
include/sslopt-vars.h:
  Resolve conflict
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict

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


sql/mysqld.cc:
  Auto merged

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

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

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


include/my_pthread.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

 - A segfault occured when the function 'kill_server' called 
   'my_sigset' with signal number 0. 'my_sigset' is a macro which
   uses 'sigaction' to install the signal handler with an invalid
   signal number will on most platforms return EINVAL but yields
   a segfauilt on IRIX 6.5
 - The server crash was detected by mysqld_safe and it was restarted although
   a shutdown was requested. 
 - Semantics of kill_server(0) is not known, leaving it intact


include/my_pthread.h:
  Check return value from sigaction with a DBUG_ASSERT
  Also DBUG_ASSERT if signal number 0 is passed
sql/mysqld.cc:
  Don't call my_sigset if signo is 0

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"


ndb/include/util/SocketServer.hpp:
  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
ndb/src/common/util/SocketServer.cpp:
  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
ndb/src/mgmsrv/Services.cpp:
  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

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

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


sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

  The 'decimals' member of Item_func was being improperly initialized,
  which resulted in improper results when handling large numeric values.


mysql-test/r/func_str.result:
  Add test results
mysql-test/t/func_str.test:
  Add new regression test
sql/item_strfunc.h:
  Remove unnecessary reset of decimals in Item_func_conv::fix_length_and_dec().