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 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:/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

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

into mishka.local:/home/my/mysql-5.0

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

into mishka.local:/home/my/mysql-5.0


sql/sql_show.cc:
  Auto merged

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

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

   DEFAULT_COLLTION_NAME field is added to SCHEMATA table


mysql-test/r/information_schema.result:
  Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
sql/sql_show.cc:
  Fix for bug#8998: information_schema: Table SCHEMATA should report default collations

This fix is about WL#2286 - Compile MySQL w/YASSL support


extra/yassl/include/yassl_int.hpp:
  Use instance as static class member to fix FC compilation problem.
extra/yassl/src/yassl_int.cpp:
  Remove local static variable, use static class member instead.
extra/yassl/taocrypt/include/integer.hpp:
  Use instance as static class member to fix FC compilation problem.
extra/yassl/taocrypt/src/integer.cpp:
  Remove local static variable, use static class member instead.

strings/decimal.c:
  Auto merged

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

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


include/my_global.h:
  Auto merged
BitKeeper/etc/logging_ok:
  auto-union
sql/share/charsets/Index.xml:
  Auto merged

Adding cp1250_croatian_ci collation.

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  old code didn't work when both decimals had zero before the decimal point

into mishka.local:/home/my/mysql-5.0

mysql-test/r/select.result:
  Added test cases for bugs 9799, 9800 and 9820
mysql-test/t/select.test:
  Added test cases for bugs 9799, 9800 and 9820

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/my_decimal.cc:
  error message fixed
strings/decimal.c:
  do_add function fixed

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

latin2_croatian_ci collation was fixed.

into mishka.local:/home/my/mysql-5.0


sql/ha_innodb.cc:
  Auto merged

into bk-internal.mysql.com:/users/rburnett/bug10245


BitKeeper/etc/logging_ok:
  auto-union

into bk-internal.mysql.com:/users/rburnett/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged

into bk-internal.mysql.com:/users/rburnett/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
include/violite.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged

into bk-internal.mysql.com:/users/rburnett/bug9721


BitKeeper/etc/logging_ok:
  auto-union

viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts


vio/viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts

include/my_global.h:
  A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).
  We don't need to manipulate HAVE_ATOMIC_XXX here as we test it in the configure.

sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/key.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

into ibmlab.site:/home/my/bk/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union

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


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb

into ibmlab.site:/home/my/bk/mysql-4.1

upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.

into hundin.mysql.fi:/home/marko/mysql-5.0.4

innobase/include/srv0srv.h:
  Restore accidentally deleted comment.