into eagle.mysql.r18.ru:/home/vva/work/BUG_671/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged

client/mysqlbinlog.cc:
  removed --table option

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

   paths for the binary distributions (this will hopefully resolve the
   "file /usr/local/mysql/libexec/mysqld doesn't exist" error that many
   people are facing)

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

mysql-test/r/range.result:
  new test added
  long lines reformatted
mysql-test/t/range.test:
  new test added
  long lines reformatted

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


sql/sql_acl.cc:
  Auto merged

sql/sql_acl.cc:
  Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
vio/viossl.c:
  Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
vio/viosslfactories.c:
  Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible

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

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


sql/sql_select.cc:
  Auto merged

mysql-test/r/sel000100.result:
  Result of the testcase added
mysql-test/t/sel000100.test:
  checking for bug #674 added

   again - even though the automake docs consider AM_CONFIG_HEADER obsolete, 
   it currently still breaks for too many people to justify this change
   at the moment.


configure.in:
   - reverted change from AC_CONFIG_HEADERS to AM_CONFIG_HEADER again - even
     though the automake docs consider AM_CONFIG_HEADER obsolete, it currently
     still breaks for too many people to justify this change at the moment.

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

Looks a bit nicer than previous one


mysql-test/r/insert.result:
  Test results added
mysql-test/t/insert.test:
  testcase for the bug added
sql/field.h:
  Field::set_default fixed
sql/field_conv.cc:
  Now we can just replace field->reset() with field->set_default() here

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).

This crash happens in rather exotic case when we try to run 
SELECT DISTINCT some_func(SUM(some_field)) GROUP BY another_field;
on a table with single row.
Optimizer marks this table as const, sets group=NULL (with remove_const)
thus, create_tmp_table makes mistake collecting columns for temporary table
and then crashes because the field_count gets less than hidden_columns_count.


sql/sql_select.cc:
  There's several ways to fix this bug.
  This one looks easy and correct to me

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

So now for the CREATE TABLE foo (id integer NOT NULL default 9)
INSERT INTO foo VALUES (NULL); we get an error
INSERT INTO foo VALUES (1), (NULL), (2); we get one warning
          and second record is set to 9

Is that what we want?


sql/field_conv.cc:
  field->set_default() calls added

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