into genie.(none):/home/hf/work/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  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

mysql-test/r/heap_btree.result:
  Make test repeatable
mysql-test/t/heap_btree.test:
  Make test repeatable

Docs/world.sql:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/heap_btree.result:
  I donno why this changed, aint my fault
sql/sql_union.cc:
  fix of the small bug

I intend to do some more accelerations in mysql_execute_command and
in SQLCOM_SELECT part for which I need to fix EXPLAIN with derived
tables plus few additional items. If this proves to be much I wil
just make it a new SCRUM task


sql/sql_lex.h:
  Some small accelerations ...
sql/sql_parse.cc:
  Some small accelerations ...
sql/sql_yacc.yy:
  Some small accelerations ...

mysql-test/r/null_key.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

Ignore changed keyblocks when on does DELETE FROM table_name;


acinclude.m4:
  Don't give warnings when using openssl installed in /usr/include with gcc 3.x
myisam/mi_delete_all.c:
  Ignore changed keyblocks when on does DELETE FROM table_name;
mysql-test/r/null_key.result:
  Fix null test
sql/ha_innodb.cc:
  Fix bug in last merge
sql/sql_parse.cc:
  Fix bug introduced with merge

sql/mysql_priv.h:
  Fix for changed parameters to filesort
sql/sql_delete.cc:
  Fix for changed parameters to filesort
sql/sql_select.cc:
  Fix for changed parameters to filesort
sql/sql_table.cc:
  Fix for changed parameters to filesort
sql/sql_test.cc:
  Removed not used special parameter
sql/sql_update.cc:
  Fix for changed parameters to filesort

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

sql/sql_parse.cc:
  Simplification of code

BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
  Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Build-tools/mysql-copyright-2:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
heap/heapdef.h:
  Auto merged
heap/hp_open.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysys/safemalloc.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.res:
  Auto merged
Build-tools/Do-compile:
  merge
Docs/manual.texi:
  merge
configure.in:
  merge
mysql-test/r/distinct.result:
  merge
mysql-test/r/null_key.result:
  merge
sql/ha_innodb.cc:
  merge
sql/item.h:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge
support-files/mysql.spec.sh:
  merge

Docs/manual.texi:
  ChangeLog
sql/field.h:
  New virtual function to set a field to null or signal an error
sql/field_conv.cc:
  New function to set a field to null or signal an error
sql/item.cc:
  When setting a field to null internally (for WHERE testing) don't autoconvert NULL -> now() or last_insert_id()
sql/item.h:
  New virtual function to set a field to null or signal an error

into fred.bitbike.com:/home/arjen/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/subselect.result:
  test for subselect explain bug
mysql-test/t/subselect.test:
  test for subselect explain bug

  Fix typo in earlier commit


innobase/btr/btr0cur.c:
  Fix typo in earlier commit

  Fix bug: range estimator exaggerated small range size greatly if the paths in the B-tree happened to branch on a high level


innobase/btr/btr0cur.c:
  Fix bug: range estimator exaggerated small range size greatly if the paths in the B-tree happened to branch on a high level

into mysql.com:/space/my/mysql-3.23

client/mysql.cc:
  Fixed a bug in --pager when used with --disable- or --skip- prefixes.
client/mysqladmin.c:
  Fixed a bug in --wait, which didn't take an optional argument while it should.
sql/mysqld.cc:
  Fixed a type and a bug in --transaction-isolation option in mysqld.cc

Build-tools/Do-compile:
   - fixed brainfart that ruined the 3.23.53-Max binaries: of course
     "--with-innodb" has to be added, when requested (will be part of
     3.23.53a packages now)

mysys/my_getopt.c:
  Fixed a bug in my_getopt; using NULL or 0 as u_max_value caused segmentation
  fault even in those programs that didn't have any use for this feature
  (prefix --maximum)

Fixed the remaining join variations, (left, right, natural, etc).
(Previous fix only solved "," and "[cross] join".)


mysql-test/r/select.result:
  Added more test case results for more braced join fixes.
mysql-test/t/select.test:
  Added more tests for braced join fixes.
sql/sql_yacc.yy:
  Changed the remaining join_table_list cases to handle braces.
  Also added some precedence declaration to silence shift/reduce conflicts
  warnings that turned up after these fixes.

into mysql.com:/home/pem/work/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union

Docs/manual.texi:
  ChangeLog

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

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

sql/sql_select.cc:
  Auto merged

create_tmp_table fails.

into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1