into mysql.com:/home/nick/mysql/repository/mysql-4.1


sql/sql_yacc.yy:
  Auto merged

mysql-test/mysql-test-run.sh:
  Added --rpl option which tests all t/rpl*.test tests.

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  removed "depriciated" as requested by salle


sql/share/charsets/Index:
  removed "depriciated" as requested by salle

and CHARSET is now the same with CHARACTER SET:

CREATE DATABASE name 
  [DEFAULT] {CHAR SET | CHARACTER SET | CHARSET} csname


CREATE TABLE (...)  [DEFAULT] {CHARSET | CHARACTER SET | CHAR SET} [=] csname

To Paul and Arjen:
However this should be recommended in db option to conform SQL99:
CREATE DATABASE dbname DEFAULT CHARACTER SET csname
In table option there is no SQL99 recommended syntax as far as
table charset is MySQL extension.

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

small Item_ref fix


mysql-test/r/subselect.result:
  DISTINCT in subselect test
mysql-test/t/subselect.test:
  DISTINCT in subselect test
sql/sql_class.cc:
  fixed DISTINCT in subselect bug

CREATE TABLE a (...) TYPE isam  CHARSET latin1  MAX_ROWS 1000;
CREATE TABLE a (...) TYPE=isam  CHARSET=latin1  MAX_ROWS=1000;
CREATE TABLE a (...) TYPE isam, CHARSET latin1, MAX_ROWS 1000;
CREATE TABLE a (...) TYPE=isam, CHARSET=latin1, MAX_ROWS=1000;

CREATE TABLE a (...) TYPE isam  CHARSET latin1  MAX_ROWS 1000;
CREATE TABLE a (...) TYPE=isam  CHARSET=latin1  MAX_ROWS=1000;

  max_sort_char is 255 for binary


strings/ctype-bin.c:
  max_sort_char is 255 for binary

  character set binary didn't work


sql/sql_yacc.yy:
  character set binary didn't work

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk

  binary charset
ctype-bin.c:
  new file


libmysql/Makefile.shared:
  binary charset
strings/Makefile.am:
  binary charset
strings/ctype.c:
  binary charset

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~56cb758b36258d1c:
  'Auto converge rename'

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

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

sql/sql_test.cc:
  small addition to COM_DEBUG

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

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

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

And I am not able to find a Changelog for 4.1


mysql-test/r/union.result:
  added a test case
mysql-test/t/union.test:
  added a test case

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