mysql_set_character_set

into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0


BitKeeper/etc/logging_ok:
  auto-union

into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0


BitKeeper/etc/logging_ok:
  auto-union

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

  Comment/*COMMENT*/is not a separator
  Ensure that whitespace is inserted after C-style comment if required.


client/mysql.cc:
  Ensure that whitespace is inserted after C-style comment if required.

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-5.0


BitKeeper/etc/logging_ok:
  auto-union

into trift-lap.fambruehe:/MySQL/M50/mysql-5.0

mysql-test/r/sp.result:
  Correct the result file for the changed test.
mysql-test/t/sp.test:
  1) Correct the "fib" stored procedure and its initial data to be mathematical correct: fib(0) = 0
  2) Do a small run of "fib" first, that is not likely to hit a memory limit (see entry 9937 in the bug DB).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/create.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_yacc.yy:
  SCCS merged

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

mysql-test/r/create.result:
  Update result
mysql-test/r/type_ranges.result:
  Update result
mysql-test/t/archive.test:
  Rewrite path for embedded server testing

sql/sql_show.cc:
  operations with grant_tables should be #ifdef-ed

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

BUILD/FINISH.sh:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
mysql-test/r/create.result:
  Merge changes
mysql-test/r/temp_table.result:
  SCCS merged
mysql-test/t/temp_table.test:
  Merge new tests
sql/item.cc:
  Merge from 4.1
sql/sql_select.cc:
  Merge from 4.1

into mysql.com:/home/gluh/MySQL/Bugs/5.0.10261

   I_S table columns information is available for any user 


mysql-test/r/information_schema.result:
  Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user
mysql-test/t/information_schema.test:
  Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user
sql/sql_show.cc:
  Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user

into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0

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

into mysql.com:/home/hf/work/mysql-5.0.9527

sql/sql_acl.cc:
  Fix for bug #9838: INFORMATION_SCHEMA.COLUMNS columns of granted views missing
    -increase grant_version in acl_init, mysql_table_grant
    -table privileges should be taken into account when we calculate column
     grants
sql/sql_show.cc:
  Fix for bug #9838: INFORMATION_SCHEMA.COLUMNS columns of granted views missing
       use 'base_name', 'file_name' because 'tables->db', 'tables->tables' could be invalid in
       case of view(derived tables).

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/create.result:
  Auto merged

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1


BitKeeper/etc/logging_ok:
  auto-union

  Fix bug by moving TRUE/FALSE in with other literals.


mysql-test/r/create.result:
  Test for Bug#9666
mysql-test/t/create.test:
  Test for Bug#9666
sql/sql_yacc.yy:
  Move TRUE/FALSE in with other literals.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.


mysql-test/r/insert_update.result:
  Test for Bug#9725
mysql-test/t/insert_update.test:
  Test for Bug#9725
sql/sql_insert.cc:
  Ignore the failure in update_row when IGNORE is set.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0

into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897


sql/sql_table.cc:
  Auto merged

   thd->lex->derived_tables should be zero(it may be changed if we open a view)


mysql-test/r/check.result:
  Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
mysql-test/t/check.test:
  Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
sql/sql_table.cc:
  Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement

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

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added

strings/decimal.c:
  added the check to make sure we don't ge -0.00

into mysql.com:/space/pekka/ndb/version/my41

ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  same number of lh3distrbits for all frags

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


client/mysql.cc:
  Auto merged

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

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


sql/ha_heap.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_base.cc:
  Auto merged

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

mysql-test/t/type_newdecimal.test:
  these lines work differently in ps-protocol mode so should always work in
  normal here

into mysql.com:/home/svoj/devel/mysql/test1-mysql-5.0