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

The above query created a field of koi8r charset, not cp1251

Change:
CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
Length now means character length, not byte length.
The above creates a field that guarantees can store a multibyte value
1 character long. For utf8 the above creates a field that can store
3 bytes.

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


sql/ha_myisam.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/sql_union.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of union unlocking problem
mysql-test/t/subselect.test:
  test of union unlocking problem
sql/sql_union.cc:
  prohibit unlocking all tables by fake select execution

Build-tools/Bootstrap:
  Add --win-dist parameter to run make_win_src_distribution
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


client/mysqldump.c:
  Auto merged

client/mysqldump.c:
  fixed bug with missing '\' in string constant

mysql-test/r/innodb.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged

  Code clean-up
sql_union.cc, union.test, union.result:
  A fix for a bug #978.
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  This is also a start of fixing UNION's properly regarding type
  acceptance.
sql_select.cc:
  A commit for my second July SPRINT task


mysql-test/r/union.result:
  A fix for a bug #978.
  
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  
  This is also a start of fixing UNION's properly regarding type
  acceptance.
mysql-test/t/union.test:
  A fix for a bug #978.
  
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  
  This is also a start of fixing UNION's properly regarding type
  acceptance.
sql/sql_select.cc:
  Code clean-up
sql/sql_union.cc:
  Code clean-up

into oak.local:/home/kostja/mysql/mysql-4.1-count-distinct

aligned with Sergey notes.


sql/records.cc:
  fix for bug #958 - big select with 
  count distinct and group by
  aligned with Sergey notes.

   my_checksum() mysys function
   NISAM checksum code moved from mysys to isam/ - it's obsolete
   MyISAM checksum code moved to mysys
   table's checksum accessible from sql layer
   SHOW TABLE STATUS shows checksum (WL#646)
code cleanup


include/my_sys.h:
  table checksum background: my_checksum() mysys function
include/myisam.h:
  table checksum background: my_checksum() mysys function
  MyISAM checksum code moved to mysys
isam/isamchk.c:
  table checksum background:
  NISAM checksum code moved from mysys to isam/ - it's obsolete
isam/isamdef.h:
  table checksum background:
  NISAM checksum code moved from mysys to isam/ - it's obsolete
isam/open.c:
  table checksum background:
  NISAM checksum code moved from mysys to isam/ - it's obsolete
isam/pack_isam.c:
  table checksum background:
  NISAM checksum code moved from mysys to isam/ - it's obsolete
myisam/mi_checksum.c:
  table checksum background: my_checksum() mysys function
  MyISAM checksum code moved to mysys
mysys/checksum.c:
  table checksum background: my_checksum() mysys function
  MyISAM checksum code moved to mysys
sql/ha_myisam.cc:
  table checksum background: table's checksum accessible from sql layer
sql/ha_myisam.h:
  table checksum background: table's checksum accessible from sql layer
sql/handler.h:
  table checksum background: table's checksum accessible from sql layer
  code cleanup
sql/sql_lex.h:
  table checksum background: table's checksum accessible from sql layer
  code cleanup
sql/sql_select.cc:
  warning removed
sql/sql_show.cc:
  SHOW TABLE STATUS shows checksum (WL#646)
sql/sql_yacc.yy:
  cleanup
  (DROP TABLES syntax added as a side effect :))

CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci);
INSERT INTO t1 VALUES ('Ü');
SELECT FIELD('ue',s1) FROM t1;
The above returned 0 in error.
Now 1 is returned.

CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci);
INSERT INTO t1 VALUES ('Ü');
INSERT INTO t1 VALUES ('ue');
SELECT DISTINCT s1 FROM t1;

The above returned two rows in error.
Now it returns one row, in latin1_german2_ci:  Ü == ue

produced an error. This led to server crash in some cases, e.g.:
create table t7 (s1 char);
select * from t7
where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci)
= 'AA';

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

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


sql/sql_acl.cc:
  Auto merged

which are fixed now.
In 4.1 there are 3 calls; 2 of them will be fixed when there is a merge;
here I fix the 3rd, new one. 

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

into mysql.com:/home/kostja/mysql/mysql-4.1-root


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

sql/item.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

mysql-test/r/fulltext2.result:
  result updated
mysql-test/t/fulltext2.test:
  test is now more silent
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
mysql-test/r/subselect.result:
  merge
  fixed test
mysql-test/t/subselect.test:
  merge
  fixed test

  Use the default character set instead of binary. This is to make "mysqlshow" -> "cat'n'paste database name" -> "mysqldump dbname" circle working.


client/mysqldump.c:
  Use the default character set instead of binary. This is to make "mysqlshow" -> "cat'n'paste database name" -> "mysqldump dbname" circle working.

  Upper/lower case translation bug for letter 't' fix.


sql/share/charsets/cp1251.xml:
  Upper/lower case translation bug for letter 't' fix.

into myvenu.com:/home/venu/work/sql/dev-4.1


sql/item.cc:
  Auto merged

by MAX/MIN in some cases:
SELECT coercibility(max(s1)) from t1;

Subselect collation and derivation was not processed
correctly:

create table a select (select s1 from t1);
select * from t1 where s1 = (select s2 from t1);

tests/client_test.c:
  Updated test_ts() test (For BR# 819)

  Revise 4.1 Windows-install instructions.


Docs/README.1st:
  Revise 4.1 Windows-install instructions.

(fixed BUG#943)


mysql-test/r/subselect.result:
  test for bug 943
mysql-test/t/subselect.test:
  test for bug 943
sql/item.cc:
  bool field changed with enum
  prevented finding references in item_list for non-SELECT st_select_lex
sql/sql_lex.cc:
  bool field changed with enum
sql/sql_lex.h:
  bool field changed with enum
sql/sql_parse.cc:
  all subqueries and UNION parts marked as SELECT
sql/sql_yacc.yy:
  bool field changed with enum
  PRIMARY SELECT command st_select_lex marked as SELECT

CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                 s2 CHAR(5) COLLATE latin1_swedish_ci);
SELECT * FROM t1 WHERE s1 = s2;

count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922)
removerd unused loop_id


mysql-test/r/subselect.result:
  test of BUG#922
mysql-test/t/subselect.test:
  test of BUG#922
sql/item.cc:
  removerd unused loop_id
  we need count HAVING clause elements, because agregate function can be present in it
sql/item.h:
  removerd unused loop_id
sql/item_subselect.cc:
  new name of field
sql/sql_derived.cc:
  new name of field
sql/sql_lex.cc:
  new name of field
sql/sql_lex.h:
  new name of field
sql/sql_select.cc:
  new name of field
sql/sql_union.cc:
  new name of field

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