BitKeeper/etc/logging_ok:
  auto-union
libmysql/Makefile.shared:
  Auto merged
mysql-test/r/rpl_deadlock.result:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/slave.cc:
  merge
sql/slave.h:
  merge
sql/sql_show.cc:
  merge

server" to the test suite, the bug is no longer repeatable.


tests/mysql_client_test.c:
  The test case for Bug#8722 "prepared statement with view crashes server"

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

"Server crashes when running out of connections"


sql/sql_class.cc:
  thd->query_id is compared with thd->warn_id in push_warning, 
  THD::THD seems to be the best place to fix it.

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


sql/ha_innodb.cc:
  Auto merged

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita

into mysql.com:/media/sda1/mysql/mysql-5.0-6282

(the bug itself is no longer repeatable).


mysql-test/r/variables.result:
  Results fixed (Bug#6282)
mysql-test/t/variables.test:
  A test case for Bug#6282 "Packet error with SELECT INTO"

"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared


libmysql/Makefile.shared:
  When we "make clean" in libmysql/ we remove the symlinks there, so we
  need to mark that they have to be recreated later: this is done by removing
  ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'.
  This Makefile.shared is used by libmysql_r too.
  No reason to remove linked_client_sources as we don't remove the links in client/.
mysql-test/r/rpl_deadlock.result:
  result fix
mysql-test/t/rpl_deadlock.test:
  small test addition
sql/mysqld.cc:
  if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions".
sql/slave.cc:
  If slave retries automatically a transaction, no message on error log
  (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4,
  5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks
  are usually resolved at first try. New global counter rli->retried_trans
  (for SHOW STATUS: total number of times the slave had to retry
  any transaction). safe_sleep() is thread-safe, sleep() was not.
  I change the rli->trans_retries counter to go from 0 to max instead
  of the other way (better for new sleep()).
sql/slave.h:
  new global counter rli->retried_trans
sql/sql_show.cc:
  SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes.
  Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet)
  when the static global status_vars is created (active_mi is set
  in init_slave()).
sql/structs.h:
  new SHOW_SLAVE_RETRIED_TRANS
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

    report correct errror in MODE_NO_AUTO_CREATE_USER
    cleanup
after merge fixes


mysql-test/r/grant2.result:
  updated after merge
mysql-test/r/grant3.result:
  updated after merge
mysql-test/r/rpl_temporary.result:
  sqlstate fixed
mysql-test/t/grant2.test:
  updated after merge
mysql-test/t/grant3.test:
  updated after merge
sql/share/errmsg.txt:
  sqlstate fixed
sql/sql_acl.cc:
  report correct errror in MODE_NO_AUTO_CREATE_USER
  cleanup

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0

into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0

  Fix typo.


mysql-test/README:
  Fix typo.

  Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries


sql/ha_innodb.cc:
  Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries

strings/ctype-utf8.c:
  A fix (bug #9309: Wrong order in INFORMATION_SCHEMA)
  We should clear the last byte, not the next one.

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


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

applications with embedded server to connect to external servers too.
(required for Connector/OO.org)

BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
scripts/fill_func_tables.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged

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

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


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

mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build

the row type is dynamic (For 4.1 tables old 'VARCHAR' fields are converted to
true VARCHAR in the next ALTER TABLE)
      
This ensures that one can use MySQL 5.0 privilege tables with MySQL 4.1.

(Fix imported from main 5.0 tree to 5.0.3 build tree.)


mysql-test/r/information_schema.result:
  Update results (for .frm version number change)
mysql-test/r/ndb_autodiscover.result:
  Update results (for .frm version number change)
mysql-test/r/ps_1general.result:
  Update results (for .frm version number change)
mysql-test/r/show_check.result:
  Update results (for .frm version number change)
mysql-test/r/view.result:
  Update results (for .frm version number change)
scripts/fill_func_tables.sh:
  Ensure that no privilege tables that is used in 4.1 uses VARCHAR
scripts/mysql_create_system_tables.sh:
  Ensure that no privilege tables that is used in 4.1 uses VARCHAR
sql/sql_table.cc:
  Only set create_info->varchar if we are using the new VARCHAR field
scripts/mysql_fix_privilege_tables.sh:
  Fixed bug that made it impossible to run the script from the mysql source dist
scripts/mysql_fix_privilege_tables.sql:
  Ensure that no privilege tables that is used in 4.1 uses VARCHAR
sql/table.cc:
  Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if
  the row type is dynamic (For 4.1 tables old 'VARCHAR' fields are converted to
  true VARCHAR in the next ALTER TABLE)

into mysql.com:/data0/mysqldev/serg/m50b

fixed my_charpos() call in Field_varstring::get_key_image


mysql-test/t/type_varchar.test:
  BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR primary key
mysql-test/r/type_varchar.result:
  BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR primary key

into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build

Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

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


innobase/include/trx0trx.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl


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

  New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
  new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
  results updated


mysql-test/r/grant.result:
  results updated
mysql-test/r/grant2.result:
  results updated
mysql-test/r/sp.result:
  results updated
mysql-test/r/system_mysql_db.result:
  results updated
mysql-test/t/grant2.test:
  new tests (mostly backported from jani's patch)
scripts/mysql_create_system_tables.sh:
  Create_user_priv added
scripts/mysql_fix_privilege_tables.sql:
  Create_user_priv added
sql/sql_acl.cc:
  Create_user_priv added
sql/sql_acl.h:
  Create_user_priv added
sql/sql_parse.cc:
  Create_user_priv added
sql/sql_show.cc:
  Create_user_priv added
sql/sql_yacc.yy:
  Create_user_priv added
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build


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

  InnoDB needs longer start time for second slave on slow hosts


mysql-test/mysql-test-run.pl:
  InnoDB needs longer start time for second slave on slow hosts
mysql-test/mysql-test-run.sh:
  InnoDB needs longer start time for second slave on slow hosts

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

- Changed error message in sql_acl.cc
- Added some more tests for GRANT.


Docs/mysqld_error.txt:
  Added new error message.
mysql-test/r/grant2.result:
  Error message changed.
mysql-test/r/grant3.result:
  Clean up.
mysql-test/t/grant2.test:
  Error message changed.
sql/share/errmsg.txt:
  Added new error message.
sql/sql_acl.cc:
  Changed error message.
mysql-test/t/grant3.test:
  Error message changed.