into  127.(none):/home/osku/mysql-5.0-2

  updated tomas default checkout


BitKeeper/etc/config:
  updated tomas default checkout

mysql-test/r/information_schema.result:
  Ensure that rows are in given order
mysql-test/t/information_schema.test:
  Ensure that rows are in given order

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

into lmy004.:/work/mysql-5.0-bug12533-2


mysql-test/r/view.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

mysql-test/r/view.result:
  result of test for bug #12533
mysql-test/t/view.test:
  test for bug #12533 (crash on DESCRIBE <view> after renaming base table column)
sql/sql_show.cc:
  close thread tables even if process_table bails out

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


configure.in:
  Auto merged

mysql-test/r/subselect2.result:
  After merge fix
sql/handler.cc:
  Remove compiler warning
sql/sql_acl.cc:
  After merge fix
sql/sql_db.cc:
  After merge fix

into lmy004.:/work/mysql-5.0-clean

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


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
  Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
configure.in:
  Auto merged
mysql-test/include/ps_conv.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/client/mysqltest.dsp:
  manual merge
VC++Files/sql/mysqld.dsp:
  manual merge
mysql-test/r/grant2.result:
  patch merge
mysql-test/r/subselect2.result:
  manual merge
mysql-test/t/grant2.test:
  patch merge
mysys/charset.c:
  Remove already deleted function
sql/examples/ha_archive.h:
  Manual merge
sql/sql_acl.cc:
  manual merge
sql/sql_db.cc:
  merge (no differences)
sql/sql_select.cc:
  manual merge
sql/table.h:
  merge (no differences)
tests/mysql_client_test.c:
  patch merge

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

for building with --without-server.


configure.in:
  Re-add mysys to sql_server_dirs, so it is built before dbug.

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


configure.in:
  Auto merged
sql/hostname.cc:
  Resolve conflict

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

datetime of when the current statement began. This also makes SYSDATE()
not safe in replication. (Bug #12562)


mysql-test/r/func_time.result:
  Add new results
mysql-test/t/func_time.test:
  Add tests for new SYSDATE() behavior
sql/item_timefunc.cc:
  Add Item_func_sysdate_local implementation
sql/item_timefunc.h:
  Add Item_func_sysdate_local, so SYSDATE() can behave differently
  than NOW().
sql/lex.h:
  SYSDATE() is no longer an alias for NOW().
sql/sql_yacc.yy:
  Handle SYSDATE()

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


sql/sql_base.cc:
  Auto merged

Removed ASSERT that can obviously never be wrong

into  mysql.com:/home/dlenev/src/mysql-5.0.12

We should not assume that "thd" argument of reload_acl_and_cache() is
non-zero. Failure to do so will cause server to crash when one sends
SIGHUP to it.


sql/sql_parse.cc:
  reload_acl_and_cache():
    When we call this function from SIGHUP handler we pass 0 as "thd" argument
    to it. So we should not assume that thd is non-zero in it.

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

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

mysql-test/r/ctype_cp932.result:
  Remove first event to make things portable
mysql-test/r/rpl_drop_db.result:
  Use 'mysqltest' as database instead of 'd1'
  Made test faster by using longer table names instead of lots of tables
mysql-test/t/ctype_cp932.test:
  Remove first event to make things portable
mysql-test/t/rpl_drop_db.test:
  Use 'mysqltest' as database instead of 'd1'
  Made test faster by using longer table names instead of lots of tables
sql/sql_db.cc:
  Indentation & style fixes
  Simple optimization (remove constant and boolean variable)

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

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

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

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

  Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different


mysql-test/r/subselect2.result:
  Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different

into mysql.com:/M41/mysql-4.1

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


sql/ha_innodb.cc:
  Auto merged

  Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain


sql/ha_innodb.cc:
  Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain

into mysql.com:/M41/mysql-4.1


mysys/charset.c:
  Auto merged

mysys/charset.c:
  SCCS merged

mysql-test/r/information_schema.result:
  changed output "view" to uppercase
mysql-test/r/view.result:
  changed output "view" to uppercase
sql/sql_show.cc:
  changed table field "view" to uppercase

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

sql/log_event.cc:
  my_malloc can be a macro

mysql-test/r/sp.result:
  fix result
mysql-test/t/sp.test:
  fix test for a bug: tests in sp.test should reuse tables t1 and t2 and create/drop tables t3, t4 etc.
  So, tables t1 and t2 were renamed into t3 and t4

into  mysql.com:/home/timka/mysql/src/5.0-2486

sql/sql_base.cc:
  Fixed a bug in PS (prepared statements) mode - the "always TRUE" constant
  Item created for outer joins with no common columns was not created in
  the PS memory.
  Now it is created in the right memory.