into deer.(none):/home/hf/work/mysql-4.0.666

mysql-test/r/func_str.result:
  test for bug #666 result
mysql-test/t/func_str.test:
  test for bug #666

Changed connect with timeout to use poll() instead if socket() to avoid problems with many open files

mysql-test/r/innodb.result:
  Fixed test case after innodb optimize->analyze fix
mysys/mf_pack.c:
  Added comments
sql/log_event.cc:
  Fixed usage of fn_format()
sql/slave.cc:
  Indentation fixes and comments cleanup
sql/sql_repl.cc:
  Comment cleanup

mysql-test/r/grant.result:
  Test of grant BUG
mysql-test/t/grant.test:
  Test of grant BUG
sql/sql_acl.cc:
  SHOW GRANTS hided real grants when grants on both column and table (Bug 654)
  Code cleanup (Bigger than intended because of editor problem)
sql/sql_acl.h:
  Fixed grant bug

into narttu.mysql.fi:/my/mysql-4.0

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union

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

into narttu.mysql.fi:/my/mysql-4.0


sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged

into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek


sql/mysqld.cc:
  Auto merged

  In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it


sql/ha_innodb.cc:
  In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it
innobase/dict/dict0dict.c:
  In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it
innobase/include/dict0dict.h:
  In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it

sql/log_event.cc:
  - cleanup_load_tmpdir() did not work at all because it forgot to indicate
  the directory part of the path when calling my_delete().
  - A misplaced R_POS_OFFSET (fortunately this was no bug as this constant is 0).
sql/sql_repl.cc:
  - fix fake_rotate_event() for pos>4G (correction of a change I pushed yesterday).

This way 3.23.58 slaves will always detect a 4.0.14 master (and stop)
immediately. BUG#198.


mysql-test/r/rpl_log.result:
  result update (the relay log now contains a fake Rotate_log_event).
mysql-test/r/rpl_log_pos.result:
  result update (the relay log now contains a fake Rotate_log_event).

sql/item_strfunc.cc:
  Item_func_elt::valXXX() functions don't expect NULL argument if it is 
  not the first one.

into mysql.com:/home/mysql_src/mysql-4.0

Safe parenthesis.

into mysql.com:/space/my/mysql-4.0-build

   problem on Windows/cygwin (BUG#668)

sql/mysqld.cc:
  Warn that --log-slave-updates is used without --log-bin and disabled.

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

Task ID 894:
Backport default_week_format variable to 4.0


mysql-test/r/func_time.result:
  Backport default_week_format variable to 4.0
mysql-test/t/func_time.test:
  Backport default_week_format variable to 4.0
sql/mysqld.cc:
  Backport default_week_format variable to 4.0
sql/set_var.cc:
  Backport default_week_format variable to 4.0
sql/sql_class.h:
  Backport default_week_format variable to 4.0
sql/sql_yacc.yy:
  Backport default_week_format variable to 4.0

  Track an assertion failure reported on the mailing list June 18th, 2003


innobase/page/page0page.c:
  Track an assertion failure reported on the mailing list June 18th, 2003

 - fixed a typo

into mysql.com:/space/my/mysql-4.0-build

  Add forgotten mutex_enter()


innobase/row/row0vers.c:
  Add forgotten mutex_enter()

  Add forgotten mtr_commit()


innobase/row/row0vers.c:
  Add forgotten mtr_commit()

  Fix error in previous push


innobase/row/row0ins.c:
  Fix error in previous push
innobase/row/row0sel.c:
  Fix error in previous push

  Fix bug: InnoDB could print that it cannot find a clustered index record if an update undo, purge, and a consistent read coincided, in rare cases it might also have returned a wrong row in a query


innobase/row/row0ins.c:
  Fix bug: InnoDB could print that it cannot find a clustered index record if an update undo, purge, and a consistent read coincided, in rare cases it might also have returned a wrong row in a query
innobase/row/row0sel.c:
  Fix bug: InnoDB could print that it cannot find a clustered index record if an update undo, purge, and a consistent read coincided, in rare cases it might also have returned a wrong row in a query
innobase/row/row0vers.c:
  Fix bug: InnoDB could print that it cannot find a clustered index record if an update undo, purge, and a consistent read coincided, in rare cases it might also have returned a wrong row in a query

mysql-test/r/rpl_rotate_logs.result:
  result update
mysql-test/t/rpl_rotate_logs.test:
  comments and test update with the error code
sql/slave.cc:
  A DBUG_PRINT
sql/sql_repl.cc:
  Use ER_MASTER_INFO instead of custom message and zero error code (which display
  badly).

into mysql.com:/home/mysql_src/mysql-4.0

with 'head').
Test fix (this sync_with_master was nonsense).
Now all tests pass in 4.0 in autobuild.


mysql-test/mysql-test-run.sh:
  Error reporting (how mysql-test-run filters the messages which mysqltest prints
  on stderr) is not reliable. It does a 'head the first line only' which in
  my case caused me to lose some time, because in fact the worrying message was
  on the second line (logically, the one which caused the die() is at the
  end of the $TIMEFILE file, not at the beginning).
  Doing a 'tail' is better but not perfect (depending on the build, one may get
  "Maximum memory usage" as the last line); it's always good to have all messages
  and spot the important one oneself. So we print all $TIMEFILE (that's a few lines
  at most).
mysql-test/t/rpl_rotate_logs.test:
  Dont sync_with_master as the SQL slave thread may be stopped at this moment;
  just wait_for_slave_to_stop. Doing sync_with_master caused a non-deterministic
  behaviour, because (note that save_master_pos was called to early) sometimes
  MASTER_POS_WAIT() started before the SQL thread died (because of unique
  violation) so returned 0, other times it started after the SQL thread died
  so returned NULL (which is reported by mysqltest as an error, on stderr).

mysql-test/t/fulltext.test:
  explain select fulltext test
mysql-test/t/fulltext_left_join.test:
  explain select fulltext test

into mysql.com:/home/mysql_src/mysql-4.0

More messages.
Testcase for bug 651.


client/mysqltest.c:
  More explicit error message if MASTER_POS_WAIT() returns NULL.
mysql-test/r/rpl_loaddata.result:
  result update
mysql-test/r/rpl_master_pos_wait.result:
  result update
mysql-test/t/rpl000001.test:
  sync_with_master (=MASTER_POS_WAIT()) was called when we could expect the SQL slave thread had stopped.
  As I yesterday changed code so that "SQL thread stops => MASTER_POS_WAIT() returns NULL immediately" (bugfix),
  sync_with_master received NULL (on build.mysql.com, not on my machine; this is a question of milliseconds,
  if the slave server will process MASTER_POS_WAIT() before or after the slave SQL thread has stopped), and
  in mysqltest.c, sync_with_master complained that it could not sync.
  So I just remove this sync_with_master, which does not make sense anymore: we just wait for the slave SQL
  thread to stop.
mysql-test/t/rpl_loaddata.test:
  Discovered we had wait_for_slave_to_stop, so used it as it automates things.
mysql-test/t/rpl_master_pos_wait.test:
  Discovered we had 'send' to send a query without waiting for the resultn so could had a testcase for bug 651.
  Shorter timeouts as there is no risk the position is reached.
sql/slave.cc:
  A longer DBUG_PRINT.

  Cleanup
ha_innodb.cc, data0type.h:
  Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes


innobase/include/data0type.h:
  Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes
sql/ha_innodb.cc:
  Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes
innobase/include/dict0dict.ic:
  Cleanup
innobase/row/row0mysql.c:
  Cleanup

  Cleanup; remove compiler warning on Windows


sql/ha_innodb.cc:
  Cleanup; remove compiler warning on Windows
sql/ha_innodb.h:
  Cleanup; remove compiler warning on Windows
sql/handler.h:
  Cleanup; remove compiler warning on Windows

into mysql.com:/home/mysql_src/mysql-4.0