BitKeeper/deleted/.del-innodb.result.es~ba2a97747fd41a3a:
  Delete: mysql-test/r/innodb.result.es
mysql-test/mysql-test-run.sh:
  Remove innodb tests from list of tests automatically skipped
  with embedded server
mysql-test/r/innodb.result:
  Update results
mysql-test/t/innodb-deadlock.test:
  Skip with embedded server
mysql-test/t/innodb-lock.test:
  Skip with embedded server
mysql-test/t/innodb.test:
  Move test of replace delayed to new test file, add to --replace_result
  to clean up path

mysql-test-run to the tests themselves.


mysql-test/t/bdb-deadlock.test:
  Don't run this test with embedded server
mysql-test/mysql-test-run.sh:
  Remove tests from being skipped with embedded server
mysql-test/t/connect.test:
  Skip test under embedded server
mysql-test/t/flush_block_commit.test:
  Skip test under embedded server
mysql-test/t/grant.test:
  Skip test under embedded server
mysql-test/t/grant2.test:
  Skip test under embedded server
mysql-test/t/grant_cache.test:
  Skip test under embedded server

appears to have been accidently disabled) and enable ctype_ucs after moving
a subtest that requires binlog to its own test file.


mysql-test/mysql-test-run.sh:
  Remove hardcoded skip of ctype_latin1_de and ctype_ucs for embedded server
mysql-test/t/ctype_ucs.test:
  Move binlog test to a new test file
mysql-test/r/ctype_ucs.result:
  Update result after test moved

to grant.test and using replace_column to neuter the Privileges column in
SHOW FULL COLUMNS.


BitKeeper/deleted/.del-alter_table.result.es~a1077916d429e443:
  Delete: mysql-test/r/alter_table.result.es
mysql-test/t/alter_table.test:
  Add replace_column for grant-related column
  Move grant-related test to grant.test
mysql-test/r/alter_table.result:
  Update results
mysql-test/t/grant.test:
  Move grant-related test from alter_table.test
mysql-test/r/grant.result:
  Add test results
mysql-test/mysql-test-run.sh:
  Don't skip alter_table test for embedded server

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

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/item_cmpfunc.cc:
  Auto merged

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


sql/sql_select.cc:
  Auto merged

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

- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the
  commercial distribution


Build-tools/mysql-copyright-2:
  - added functionality to replace a copyright header in .sql files, too (needed for updating
    scripts/fill_help_tables.sql in the commercial source distribution)
scripts/fill_help_tables.sh:
  - added copyright header on top of the fill_help_tables.sql file (BUG#5772)

into mysql.com:/home/jonas/src/mysql-4.1

Fix bug in bug fix in FastScheduler
  remove possibility of endless loop
  resulting in APZJobBuffer overflow due to statistics reporting


ndb/src/kernel/vm/FastScheduler.cpp:
  Fix bug in bug fix in FastScheduler
    remove possibility of endless loop
    resulting in APZJobBuffer overflow due to statistics reporting

mysql-test/r/heap_hash.result:
  Testcase for BUG#8371: wrong rec_per_key value for hash index on temporary table
mysql-test/t/heap_hash.test:
  Testcase for BUG#8371: wrong rec_per_key value for hash index on temporary table
sql/ha_heap.cc:
  Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table:
  Don't assume that table->rec_per_key==NULL if table->tmp_table != NO_TMP_TABLE, 
  this is not true for tables created with "CREATE TEMPORARY TABLE" (while it holds
  for temporary tables created during query execution)
sql/sql_select.cc:
  Initialize rec_per_key for all keys in temporary table.

into mysql.com:/home/wax/mysql/mysql-4.1test2

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

Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func()


BitKeeper/etc/ignore:
  added support-files/ndb-config-2-node.ini
mysql-test/r/group_by.result:
  More complicated test to assure that rand() is only calulated once
mysql-test/r/user_var.result:
  Back to old results :(  (ok but not perfect)
mysql-test/t/group_by.test:
  More complicated test to assure that rand() is only calulated once
sql/item.cc:
  Better bugfix for "HAVING when refering to RAND()"
  This will ensure that when refering to things like RAND() in HAVING through an alias we will not recalculate that rand() value in the HAVING part but use the value in the row
  Generalize split_sum_func()
sql/item.h:
  Better bugfix for "HAVING when refering to RAND()"
  T
sql/item_cmpfunc.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/item_func.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/item_row.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/item_strfunc.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Use generalized split_sum_func2() function
sql/sql_list.h:
  Add functions to concatenate lists
sql/sql_select.cc:
  Better bugfix for "HAVING when refering to RAND()"
  Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
  This will ensure that any reference to these has a valid value.

single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
is used and isolation level of the transaction is not serializable. 
InnoDB uses consistent read in these cases for a selected table.
Backported from 5.0.x.


sql/ha_innodb.cc:
  Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and 
  single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
  is used and isolation level of the transaction is not serializable. 
  InnoDB uses consistent read in these cases for a selected table.

which fixes running the tests when using the bundled zlib.


mysql-test/mysql-test-run.sh:
  Add zlib .libs dir to LD_LIBRARY_PATH

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  fixed start-and-exit flag


mysql-test/mysql-test-run.sh:
  fixed start-and-exit flag

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


sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

(BUG 8216)


mysql-test/r/group_by.result:
  New test case
mysql-test/r/user_var.result:
  Test changed (to be more correct) with bug fix
mysql-test/t/group_by.test:
  Added test for HAVING bug
sql/item_cmpfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_func.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_row.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_strfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/unireg.h:
  Added PSEUDO_TABLES_BITS for easy testing of real table reference

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  removed typo
  moved pre to post for directory creation
  add changelog comments


support-files/mysql.spec.sh:
  removed typo
  moved pre to post for directory creation
  add changelog comments

  Set CCLD as well


BUILD/compile-solaris-sparc-purify:
  Set CCLD as well

into mysql.com:/home/jonas/src/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  corrected typo in previous changeset


sql/ha_ndbcluster.cc:
  corrected typo in previous changeset

  Minor tweaks to work properly


Build-tools/Do-solaris-pkg:
  Minor tweaks to work properly

Corrected fragmentation calculation to take into account that LQH creates "2 fragments per fragment" in 4.1 and 5.0
+added some comments to ndb fragmentation calulation

into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1

  Deposit the new .pkg.gz into the ~/$hostname/ directory


Build-tools/Do-solaris-pkg:
  Deposit the new .pkg.gz into the ~/$hostname/ directory

  Perl script to create Solaris installation packages.

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

mysql-test/r/subselect.result:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
mysql-test/r/subselect_innodb.result:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
mysql-test/t/subselect.test:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
mysql-test/t/subselect_innodb.test:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'

into mysql.com:/home/jonas/src/mysql-4.1