- Removed hardcoded error message from 4.1


include/my_base.h:
  Adding error message for the case when table definition has changed in storage engine
mysql-test/t/ndb_alter_table.test:
  Updated testresult to expect new error code
sql/ha_ndbcluster.cc:
  Add mapping for ndb error 284 to HA_ERR_TABLE_DEF_CHANGED, this error will occur when the table definition has been changed by another MySQL Server connected to the cluster.
  Remove hardcoded errormessage from 4.1
sql/handler.cc:
  Adding error message for the case when table definition has changed in storage engine
sql/share/errmsg.txt:
  Adding error message for the case when table definition has changed in storage engine

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

mysql-test/r/null.result:
  Update results
mysql-test/r/show_check.result:
  Update results
mysql-test/r/strict.result:
  Update results
mysql-test/t/null.test:
  Fix default for smallint column.
mysql-test/t/show_check.test:
  Fix default for bool column.

mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/limit.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/t/strict.test:
  SCCS merged

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

the argument type. Fixed also some float() casts to double() as query_id
is now actually longlong type. Related to Bug#9646.



sql/sql_parse.cc:
  Some of the argument place holders were not quite correct compared to
  the argument type. Fixed also some float() casts to double() as query_id
  is now actually longlong type.

mysql-test/Makefile.am:
  Remove result.es references
scripts/make_binary_distribution.sh:
  Remove result.es refernece

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

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


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

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

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


sql/mysqld.cc:
  Auto merged

  Fix Bug #8650 : InnoDB does not rollback SQL statement at an error


sql/ha_innodb.cc:
  Fix Bug #8650 : InnoDB does not rollback SQL statement at an error
sql/handler.cc:
  Fix Bug #8650 : InnoDB does not rollback SQL statement at an error

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

BitKeeper/etc/ignore:
  added client/mysqltestmanagerc

into mysql.com:/home/pem/work/mysql-5.0

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

Fix Bug #9517  Condition pushdown to storage engine does not work for update/delete, post review fix, removed quick constraint

... make the handler catch too.


mysql-test/r/strict.result:
  Updated corrected result for BUG#5907.
mysql-test/t/strict.test:
  Corrected test for BUG#5907.
sql/sp_head.cc:
  Make handlers catch certain bad data exceptions in strict mode too.

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

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

    after merge fix
sql/mysqld.cc
    too early for sync-binlog=1 by default :)


sql/item.cc:
  after merge fix
sql/mysqld.cc:
  too early for sync-binlog=1 by default :)

innobase/row/row0sel.c:
  Disable an assertion that fails for old UTF-8 ENUM columns (Bug #9526)

sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/handler.cc:
  SCCS merged

fix a race condition in TC_LOG_BINLOG::unlog


include/Makefile.am:
  remove the rest of isam/merge references
include/config-win.h:
  unused and abused macro removed
include/my_pthread.h:
  unused and abused macro removed
include/my_sys.h:
  MY_IGNORE_BADFD flag
include/mysql_embed.h:
  remove the rest of isam/merge references
mysql-test/r/replace.result:
  remove the rest of isam/merge references
mysql-test/t/replace.test:
  remove the rest of isam/merge references
mysql-test/t/xa.test:
  comment
mysys/my_sync.c:
  MY_IGNORE_BADFD flag
sql/handler.cc:
  remove the rest of isam/merge references
sql/log.cc:
  fix a race condition in TC_LOG_BINLOG::unlog
  preparation for binlog group commit
sql/mysql_priv.h:
  remove duplicates
sql/mysqld.cc:
  remove the rest of isam/merge references
sql/opt_range.cc:
  remove the rest of isam/merge references
sql/set_var.cc:
  hide unused variables. simplify sync_binlog code
sql/sql_base.cc:
  remove the rest of isam/merge references
sql/sql_class.h:
  cleanup

   restore original 'lex->query_tables' table list after
   processing of information schema table
   remove unnecessary operations


mysql-test/r/ps.result:
  Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
mysql-test/t/ps.test:
  Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
sql/sql_lex.h:
  Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
sql/sql_show.cc:
  Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement

into mysql.com:/home/gluh/MySQL/Bugs/mysql-5.0

    the fix for 'columns' table only
    Rights check for 'routines' table is already done
    (see WL2131 Access control for SHOW ... PROCEDURE|FUNCTION ...)
    rename 'testtets' database to 'mysqltest' to keep number of
      DBs which created by mysql-test as small as possible


mysql-test/r/information_schema.result:
  Fix for bug#7214: information_schema: unauthorized user can see metadata
mysql-test/t/information_schema.test:
  Fix for bug#7214: information_schema: unauthorized user can see metadata
sql/sql_show.cc:
  Fix for bug#7214: information_schema: unauthorized user can see metadata

into mysql.com:/usr/home/ram/work/mysql-5.0

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/unireg.cc:
  Fix for bug #9571: Primary key creation causes server crash.
  We should pass null_pos to the make_field() anyway,
  as we use it for bit fields.

mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

into mysql.com:/home/cps/mysql/trees/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged

mysql-test/r/join_outer.result:
  Update results
mysql-test/t/join_outer.test:
  Merge

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

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


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

mysql-test/t/view_grant.test:
  Skip test with embedded server