into mysql.com:/space/my/mysql-5.0-build


sql/ha_innodb.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

  the rpm spec file changelog


sql/ha_innodb.cc:
  - Merge: used local version (as the fix in 4.0 was a backport)
support-files/mysql.spec.sh:
  - manual merge from 4.0

  the MySQL-server RPM spec file (BUG#12348)


support-files/mysql.spec.sh:
  - Fixed the creation of the mysql user group account in the postinstall section
   (BUG#12348)

support-files/mysql.spec.sh:
  - fixed enabling the Archive storage engine for the mysqld-max binary

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0

Adds --replace_column to make test results deterministic.


mysql-test/r/rpl_slave_status.result:
  BUG#12330 updated result file which I missed in last changeset
  This updates the test to use --replace_column to make the test
  deterministic.

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


configure.in:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
  Auto merged
BitKeeper/etc/config:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/client/mysqltest.dsp:
  Auto merged
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug12330

mysql-test/t/rpl_slave_status.test:
  Add --replace-column to make show slave status deterministic

into mysql.com:/M41/mysql-4.1

BitKeeper/etc/config:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqlcheck.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/client/mysqltest.dsp:
  Auto merged
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsp:
  Auto merged
acinclude.m4:
  Auto merged
zlib/ChangeLog:
  Auto merged
zlib/FAQ:
  Auto merged
zlib/INDEX:
  Auto merged
zlib/README:
  Auto merged
zlib/crc32.c:
  Auto merged
zlib/deflate.c:
  Auto merged
zlib/deflate.h:
  Auto merged
zlib/gzio.c:
  Auto merged
zlib/infback.c:
  Auto merged
zlib/inffast.c:
  Auto merged
zlib/inflate.c:
  Auto merged
zlib/inftrees.c:
  Auto merged
zlib/inftrees.h:
  Auto merged
zlib/trees.c:
  Auto merged
zlib/zconf.h:
  Auto merged
zlib/zlib.3:
  Auto merged
zlib/zlib.h:
  Auto merged
zlib/zutil.h:
  Auto merged

into mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-5.0

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


sql/ha_innodb.cc:
  Auto merged

into  hundin.mysql.fi:/home/heikki/mysql-4.1

  Fix compilation error in the fix of Bug #12263


sql/ha_innodb.cc:
  Fix compilation error in the fix of Bug #12263

  Fix compilation error in previous commit


sql/ha_innodb.cc:
  Fix compilation error in previous commit

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


innobase/buf/buf0buf.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

  Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later


innobase/buf/buf0buf.c:
  Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later

into  hundin.mysql.fi:/home/heikki/mysql-4.1


sql/ha_innodb.cc:
  Auto merged

  Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)


sql/ha_innodb.cc:
  Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)

  Push the patch of Jan Lindstrom: better comments
ha_innodb.cc:
  Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction


sql/ha_innodb.cc:
  Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction
sql/ha_innodb.h:
  Push the patch of Jan Lindstrom: better comments
innobase/trx/trx0trx.c:
  Push the patch of Jan Lindstrom: better comments
innobase/srv/srv0srv.c:
  Push the patch of Jan Lindstrom: better comments
innobase/srv/srv0start.c:
  Push the patch of Jan Lindstrom: better comments
innobase/row/row0sel.c:
  Push the patch of Jan Lindstrom: better comments
innobase/read/read0read.c:
  Push the patch of Jan Lindstrom: better comments
innobase/include/read0read.h:
  Push the patch of Jan Lindstrom: better comments
innobase/include/trx0trx.h:
  Push the patch of Jan Lindstrom: better comments

into mysql.com:/data0/mysqldev/lenz/mysql-5.0


ndb/src/common/portlib/NdbMutex.c:
  Auto merged
ndb/src/common/portlib/NdbThread.c:
  Auto merged

 - Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
   compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) in ndb/src/common/portlib/NdbMutex.c
   and ndb/src/common/portlib/NdbThread.c
 - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll() in 
   ndb/tools/config.cpp


ndb/src/common/portlib/NdbMutex.c:
   - Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
     compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)
ndb/src/common/portlib/NdbThread.c:
   - Moved a DBUG_ENTER statement after the variable declarations to satisfy some
     compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)
ndb/tools/config.cpp:
   - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll()

into moonbone.local:/work/mysql-5.0-bug-11934

into mysql.com:/home/psergey/mysql-5.0-sp-no-lock-r7


sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

Added check which throws ER_WRONG_OBJECT error in case the .frm
doesn't contain a valid table type (e.g. view or trigger)


mysql-test/r/create.result:
  Added test case for bug #6859
mysql-test/t/create.test:
  Add testcase for bug #6850

mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged

* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files


mysql-test/r/sp-prelocking.result:
  Prelocking-free SPs, post-review fixes:
  Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
  Don't drop the table we're not using.
mysql-test/r/sp.result:
  Prelocking-free SPs, post-review fixes:
  remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
  Prelocking-free SPs, post-review fixes:
  Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
  Don't drop the table we're not using.
mysql-test/t/sp.test:
  Prelocking-free SPs, post-review fixes:
  remove redundant "drop table if exists t3" statements
sql/sp.cc:
  New, better defined, sp_get_prelocking_info() function to get info about
    statement prelocking options
sql/sp.h:
  Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info() 
  function to get info about statement prelocking options
sql/sp_cache.h:
  Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
  Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that 
  attaches removes statement's prelocking tables.
sql/sql_base.cc:
  Prelocking-free SPs, post-review fixes:
  * Use a better defined sp_get_prelocking_info() function to get info about 
    statement prelocking options
  * Don't activate prelocked mode for evaluation of SP arguments that use tables 
    but don't need prelocking.
sql/sql_class.cc:
  Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.

mysql-test/r/information_schema.result:
  Update test results

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


client/mysqltest.c:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  Resolve conflict

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

mysql-test/t/information_schema.test:
  Stub out column in results that we don't care about, and may vary
mysql-test/r/information_schema.result:
  Update results

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


VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/Makefile.am:
  Auto merged

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