bk commit into 5.0 tree (sergefp:1.1941)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1941 05/08/07 21:30:46 sergefp@stripped +12 -0
  Manual merge

  mysql-test/t/group_by.test
    1.50 05/08/07 21:30:42 sergefp@stripped +10 -10
    Manual merge

  mysql-test/r/query_cache.result
    1.60 05/08/07 21:30:42 sergefp@stripped +0 -9
    Manual merge

  mysql-test/r/group_by.result
    1.62 05/08/07 21:30:42 sergefp@stripped +0 -0
    Manual merge

  sql/sql_union.cc
    1.125 05/08/07 21:27:36 sergefp@stripped +0 -0
    Auto merged

  sql/item_timefunc.h
    1.56 05/08/07 21:27:36 sergefp@stripped +0 -0
    Auto merged

  sql-common/my_time.c
    1.16 05/08/07 21:27:36 sergefp@stripped +0 -0
    Auto merged

  mysql-test/t/rpl_flush_tables.test
    1.8 05/08/07 21:27:36 sergefp@stripped +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.46 05/08/07 21:27:36 sergefp@stripped +0 -0
    Auto merged

  mysql-test/t/fulltext_order_by.test
    1.21 05/08/07 21:27:36 sergefp@stripped +0 -0
    Auto merged

  mysql-test/r/type_datetime.result
    1.27 05/08/07 21:27:36 sergefp@stripped +0 -0
    Auto merged

  mysql-test/r/fulltext_order_by.result
    1.19 05/08/07 21:27:36 sergefp@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-not_windows.inc
    1.2 05/08/07 21:27:36 sergefp@stripped +0 -0
    Delete: mysql-test/include/not_windows.inc

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug11869-part3/RESYNC

--- 1.55/sql/item_timefunc.h	2005-07-01 04:05:35 +00:00
+++ 1.56/sql/item_timefunc.h	2005-08-07 21:27:36 +00:00
@@ -714,6 +714,12 @@
   {
     return (new Field_date(maybe_null, name, t_arg, &my_charset_bin));
   }  
+  void fix_length_and_dec()
+  {
+    collation.set(&my_charset_bin);
+    max_length= 10;
+    maybe_null= 1;
+  }
 };
 
 

--- 1.124/sql/sql_union.cc	2005-08-07 21:21:25 +00:00
+++ 1.125/sql/sql_union.cc	2005-08-07 21:27:36 +00:00
@@ -119,8 +119,6 @@
 st_select_lex_unit::init_prepare_fake_select_lex(THD *thd) 
 {
   thd->lex->current_select= fake_select_lex;
-  fake_select_lex->ftfunc_list_alloc.empty();
-  fake_select_lex->ftfunc_list= &fake_select_lex->ftfunc_list_alloc;
   fake_select_lex->table_list.link_in_list((byte *)&result_table_list,
 					   (byte **)
 					   &result_table_list.next_local);
@@ -301,7 +299,8 @@
     /*
       Force the temporary table to be a MyISAM table if we're going to use
       fullext functions (MATCH ... AGAINST .. IN BOOLEAN MODE) when reading
-      from it.
+      from it (this should be removed in 5.2 when fulltext search is moved 
+      out of MyISAM).
     */
     if (global_parameters->ftfunc_list->elements)
       create_options= create_options | TMP_TABLE_FORCE_MYISAM;

--- 1.7/mysql-test/t/rpl_flush_tables.test	2005-07-28 13:12:36 +00:00
+++ 1.8/mysql-test/t/rpl_flush_tables.test	2005-08-07 21:27:36 +00:00
@@ -3,7 +3,10 @@
 # RENAME TABLE work with MERGE tables on the slave.
 # Test of FLUSH NO_WRITE_TO_BINLOG by the way.
 #
-source include/master-slave.inc;
+--source include/master-slave.inc
+# Skipped on Windows because it can't handle a table underlying an open
+# merge table getting renamed.
+--source include/not_windows.inc
 
 create table t1 (a int);
 insert into t1 values (10);

--- 1.15/sql-common/my_time.c	2005-07-31 09:49:46 +00:00
+++ 1.16/sql-common/my_time.c	2005-08-07 21:27:36 +00:00
@@ -207,7 +207,7 @@
   {
     /* Found date in internal format (only numbers like YYYYMMDD) */
     year_length= (digits == 4 || digits == 8 || digits >= 14) ? 4 : 2;
-    field_length=year_length-1;
+    field_length= year_length;
     is_internal_format= 1;
     format_position= internal_format_positions;
   }
@@ -237,6 +237,8 @@
         start_loop= 5;                         /* Start with first date part */
       }
     }
+
+    field_length= format_position[0] == 0 ? 4 : 2;
   }
 
   /*
@@ -261,7 +263,7 @@
     const char *start= str;
     ulong tmp_value= (uint) (uchar) (*str++ - '0');
     while (str != end && my_isdigit(&my_charset_latin1,str[0]) &&
-           (!is_internal_format || field_length--))
+           --field_length)
     {
       tmp_value=tmp_value*10 + (ulong) (uchar) (*str - '0');
       str++;
@@ -275,8 +277,8 @@
     date[i]=tmp_value;
     not_zero_date|= tmp_value;
 
-    /* Length-1 of next field */
-    field_length= format_position[i+1] == 0 ? 3 : 1;
+    /* Length of next field */
+    field_length= format_position[i+1] == 0 ? 4 : 2;
 
     if ((last_field_pos= str) == end)
     {
@@ -294,7 +296,7 @@
       if (*str == '.')                          /* Followed by part seconds */
       {
         str++;
-        field_length= 5;                        /* 5 digits after first (=6) */
+        field_length= 6;                        /* 6 digits */
       }
       continue;
 

--- 1.61/mysql-test/r/group_by.result	2005-07-04 13:00:55 +00:00
+++ 1.62/mysql-test/r/group_by.result	2005-08-07 21:30:42 +00:00
@@ -756,6 +756,13 @@
 SELECT n+1 AS n FROM t1 GROUP BY n;
 n
 2
+create table t1 (f1 date);
+insert into t1 values('2005-06-06');
+insert into t1 values('2005-06-06');
+select date(left(f1+0,8)) from t1 group by 1;
+date(left(f1+0,8))
[phone]
+drop table t1;
 Warnings:
 Warning	1052	Column 'n' in group statement is ambiguous
 DROP TABLE t1;

--- 1.26/mysql-test/r/type_datetime.result	2005-07-18 23:12:41 +00:00
+++ 1.27/mysql-test/r/type_datetime.result	2005-08-07 21:27:36 +00:00
@@ -153,3 +153,13 @@
 0000-00-00 00:00:00
 0000-00-00 00:00:00
 drop table t1;
+create table t1 (dt datetime);
+insert into t1 values ("20010101T010101");
+insert into t1 values ("2001-01-01T01:01:01");
+insert into t1 values ("2001-1-1T1:01:01");
+select * from t1;
+dt
[phone]:01:01
[phone]:01:01
[phone]:01:01
+drop table t1;

--- 1.49/mysql-test/t/group_by.test	2005-07-28 14:09:48 +00:00
+++ 1.50/mysql-test/t/group_by.test	2005-08-07 21:30:42 +00:00
@@ -576,6 +576,16 @@
 CREATE TABLE t2 (id varchar(20) NOT NULL, err_comment blob NOT NULL);
 INSERT INTO t2 VALUES ('trans1', 'a problem');
 
+#
+# Bug #12266 GROUP BY expression on DATE column produces result with
+#            reduced length
+#
+create table t1 (f1 date);
+insert into t1 values('2005-06-06');
+insert into t1 values('2005-06-06'); 
+select date(left(f1+0,8)) from t1 group by 1;
+drop table t1;
+
 SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment
   FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;
 

--- 1.45/mysql-test/t/query_cache.test	2005-08-04 11:36:08 +00:00
+++ 1.46/mysql-test/t/query_cache.test	2005-08-07 21:27:36 +00:00
@@ -709,9 +709,9 @@
 
 INSERT INTO t1 VALUES ('20050326');
 INSERT INTO t1 VALUES ('20050325');
-SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 0:0:0';
-SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 0:0:0';
-SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 0:0:0';
+SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid';
+SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 invalid';
+SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid';
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_inserts";
 show status like "Qcache_hits";

--- 1.18/mysql-test/r/fulltext_order_by.result	2005-08-07 21:21:25 +00:00
+++ 1.19/mysql-test/r/fulltext_order_by.result	2005-08-07 21:27:36 +00:00
@@ -163,6 +163,10 @@
 (select b.id, b.betreff from t3 b) 
 order by match(betreff) against ('+abc' in boolean mode) desc;
 id	betreff
+(select b.id, b.betreff from t3 b) union 
+(select b.id, b.betreff from t3 b) 
+order by match(betreff) against ('+abc') desc;
+ERROR HY000: Can't find FULLTEXT index matching the column list
 select distinct b.id, b.betreff from t3 b 
 order by match(betreff) against ('+abc' in boolean mode) desc;
 id	betreff

--- 1.20/mysql-test/t/fulltext_order_by.test	2005-08-07 21:21:25 +00:00
+++ 1.21/mysql-test/t/fulltext_order_by.test	2005-08-07 21:27:36 +00:00
@@ -138,6 +138,11 @@
 (select b.id, b.betreff from t3 b) 
 order by match(betreff) against ('+abc' in boolean mode) desc;
 
+--error 1191
+(select b.id, b.betreff from t3 b) union 
+(select b.id, b.betreff from t3 b) 
+order by match(betreff) against ('+abc') desc;
+
 select distinct b.id, b.betreff from t3 b 
 order by match(betreff) against ('+abc' in boolean mode) desc;