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


sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

mysql-test/r/create.result:
  added test for bug #910 (right type of ifnull function)
mysql-test/t/create.test:
  added test for bug #910 (right type of ifnull function)
sql/field.h:
  added new constructors of Field_decimal, Field_tiny, Field_short, Field_float,
  Field_null, Field_year
  for using in Item::tmp_table_field_from_field_type
sql/item.cc:
  added Item::tmp_table_field_from_field_type
sql/item.h:
  added Item::tmp_table_field_from_field_type

equivalent of compile-pentium-debug but with
--enable-maintainer-mode configure option
Maybe it's worth to merge compile-mentium-debug
and compile-pentium-maintainer to a single script

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

mysql-test/r/derived.result:
  test of BUG#1031
mysql-test/t/derived.test:
  test of BUG#1031
sql/item_sum.cc:
  'alias' parameter added to create_tmp_table
sql/sql_derived.cc:
  Derived table should be named (to pass it name to Field and then to Item_field)
sql/sql_select.cc:
  'alias' parameter added to create_tmp_table
sql/sql_select.h:
  'alias' parameter added to create_tmp_table
sql/sql_union.cc:
  'alias' parameter added to create_tmp_table
sql/sql_update.cc:
  'alias' parameter added to create_tmp_table

into mysql.com:/home/dlenev/src/mysql-4.1-345

configure.in:
  ./configure now tests if gmtime_r is present
include/config-os2.h:
  Supposing that OS/2 have gmtime_r
include/my_pthread.h:
  Use our imeplementation of gmtime_r if system lacks one
mysql-test/r/func_time.result:
  Added UTC_* functions to test
mysql-test/t/func_time.test:
  Added UTC_* functions to test
mysys/my_pthread.c:
  Our implementation of gmtime_r
mysys/my_thr_init.c:
  Now we also need LOCK_locktime_r if gmtime_r is absent
sql/item_timefunc.cc:
  Generalized classes for CURDATE, CURTIME and NOW, abstracted them from
  timezone. Added new children classes for implementing these and UTC_*
  functions.
sql/item_timefunc.h:
  Generalized classes for CURDATE, CURTIME and NOW, abstracted them from
  timezone. Added new children classes for implementing these and UTC_*
  functions.
sql/lex.h:
  Added tokens for UTC_TIME, UTC_DATE and UTC_TIMESTAMP
sql/sql_yacc.yy:
  Added UTC_* functions to grammar. Current functions are using 
  classes now.

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.

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.

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)