Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin 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.2369 06/04/25 20:05:15 aelkin@stripped +9 -0
Merge mysql.com:/home/elkin/MySQL/BARE/5.0
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
sql/sql_base.cc
1.317 06/04/25 20:05:07 aelkin@stripped +35 -121
manual merge use local. Another changeset for 5.1 is following.
storage/myisam/myisam_ftdump.c
1.40 06/04/25 20:00:08 aelkin@stripped +0 -0
Auto merged
storage/myisam/myisam_ftdump.c
1.36.2.2 06/04/25 20:00:08 aelkin@stripped +0 -0
Merge rename: myisam/myisam_ftdump.c -> storage/myisam/myisam_ftdump.c
sql/item_strfunc.cc
1.269 06/04/25 20:00:08 aelkin@stripped +0 -0
Auto merged
sql/item_cmpfunc.cc
1.203 06/04/25 20:00:08 aelkin@stripped +0 -0
Auto merged
mysql-test/t/rpl_temporary.test
1.20 06/04/25 20:00:08 aelkin@stripped +0 -0
Auto merged
mysql-test/t/case.test
1.20 06/04/25 20:00:08 aelkin@stripped +0 -0
Auto merged
mysql-test/r/rpl_temporary.result
1.25 06/04/25 20:00:08 aelkin@stripped +0 -0
Auto merged
mysql-test/r/case.result
1.27 06/04/25 20:00:08 aelkin@stripped +0 -0
Auto merged
mysql-test/mysql-test-run.pl
1.109 06/04/25 20:00:08 aelkin@stripped +0 -0
Auto merged
# 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: aelkin
# Host: dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root: /net/nb/home/elkin/MySQL/MERGE/5.1-new/RESYNC
--- 1.202/sql/item_cmpfunc.cc 2006-04-12 23:14:52 +03:00
+++ 1.203/sql/item_cmpfunc.cc 2006-04-25 20:00:08 +03:00
@@ -41,10 +41,25 @@
static void agg_result_type(Item_result *type, Item **items, uint nitems)
{
- uint i;
- type[0]= items[0]->result_type();
- for (i=1 ; i < nitems ; i++)
- type[0]= item_store_type(type[0], items[i]->result_type());
+ Item **item, **item_end;
+
+ *type= STRING_RESULT;
+ /* Skip beginning NULL items */
+ for (item= items, item_end= item + nitems; item < item_end; item++)
+ {
+ if ((*item)->type() != Item::NULL_ITEM)
+ {
+ *type= (*item)->result_type();
+ item++;
+ break;
+ }
+ }
+ /* Combine result types. Note: NULL items don't affect the result */
+ for (; item < item_end; item++)
+ {
+ if ((*item)->type() != Item::NULL_ITEM)
+ *type= item_store_type(type[0], (*item)->result_type());
+ }
}
--- 1.268/sql/item_strfunc.cc 2006-04-24 23:17:44 +03:00
+++ 1.269/sql/item_strfunc.cc 2006-04-25 20:00:08 +03:00
@@ -2941,6 +2941,7 @@
if (!res)
goto err;
+ null_value= 0;
if (res->is_empty())
return res;
--- 1.108/mysql-test/mysql-test-run.pl 2006-04-21 16:35:57 +03:00
+++ 1.109/mysql-test/mysql-test-run.pl 2006-04-25 20:00:08 +03:00
@@ -3580,7 +3580,7 @@
if ( $opt_valgrind_options )
{
- mtr_add_arg($args, split(' ', $opt_valgrind_options));
+ mtr_add_arg($args, '%s', $_) for (split(' ', $opt_valgrind_options));
}
--- 1.26/mysql-test/r/case.result 2006-03-06 12:35:32 +02:00
+++ 1.27/mysql-test/r/case.result 2006-04-25 20:00:08 +03:00
@@ -175,6 +175,14 @@
case+union+test
case+union+test
nobug
+create table t1(a float, b int default 3);
+insert into t1 (a) values (2), (11), (8);
+select min(a), min(case when 1=1 then a else NULL end),
+min(case when 1!=1 then NULL else a end)
+from t1 where b=3 group by b;
+min(a) min(case when 1=1 then a else NULL end) min(case when 1!=1 then NULL else a end)
+2 2 2
+drop table t1;
CREATE TABLE t1 (EMPNUM INT);
INSERT INTO t1 VALUES (0), (2);
CREATE TABLE t2 (EMPNUM DECIMAL (4, 2));
--- 1.19/mysql-test/t/case.test 2006-02-24 23:20:42 +02:00
+++ 1.20/mysql-test/t/case.test 2006-04-25 20:00:08 +03:00
@@ -122,6 +122,17 @@
UNION
SELECT CASE '1' WHEN '2' THEN 'BUG' ELSE 'nobug' END;
+#
+# Bug #17896: problem with MIN(CASE...)
+#
+
+create table t1(a float, b int default 3);
+insert into t1 (a) values (2), (11), (8);
+select min(a), min(case when 1=1 then a else NULL end),
+ min(case when 1!=1 then NULL else a end)
+from t1 where b=3 group by b;
+drop table t1;
+
# End of 4.1 tests
--- 1.36.2.1/myisam/myisam_ftdump.c 2006-04-24 03:25:28 +03:00
+++ 1.40/storage/myisam/myisam_ftdump.c 2006-04-25 20:00:08 +03:00
@@ -86,7 +86,7 @@
init_key_cache(dflt_key_cache,MI_KEY_BLOCK_LENGTH,USE_BUFFER_INIT, 0, 0);
- if (!(info=mi_open(argv[0],2,HA_OPEN_ABORT_IF_LOCKED)))
+ if (!(info=mi_open(argv[0],2,HA_OPEN_ABORT_IF_LOCKED|HA_OPEN_FROM_SQL_LAYER)))
{
error=my_errno;
goto err;
--- 1.24/mysql-test/r/rpl_temporary.result 2006-04-09 19:38:51 +03:00
+++ 1.25/mysql-test/r/rpl_temporary.result 2006-04-25 20:00:08 +03:00
@@ -88,3 +88,17 @@
1
drop temporary table t4;
drop table t5;
+set @session.pseudo_thread_id=100;
+create temporary table t101 (id int);
+create temporary table t102 (id int);
+set @session.pseudo_thread_id=200;
+create temporary table t201 (id int);
+create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
+set @con1_id=connection_id();
+kill @con1_id;
+create table t1(f int);
+insert into t1 values (1);
+select * from t1 /* must be 1 */;
+f
+1
+drop table t1;
--- 1.19/mysql-test/t/rpl_temporary.test 2006-04-08 15:31:43 +03:00
+++ 1.20/mysql-test/t/rpl_temporary.test 2006-04-25 20:00:08 +03:00
@@ -131,6 +131,8 @@
create temporary table t3 (f int);
sync_with_master;
+# The server will now close done
+
#
# Bug#17284 erroneous temp table cleanup on slave
#
@@ -156,5 +158,31 @@
drop temporary table t4;
drop table t5;
-# The server will now close done
+#
+# BUG#17263 incorrect generation DROP temp tables
+# Temporary tables of connection are dropped in batches
+# where a batch correspond to pseudo_thread_id
+# value was set up at the moment of temp table creation
+#
+connection con1;
+set @session.pseudo_thread_id=100;
+create temporary table t101 (id int);
+create temporary table t102 (id int);
+set @session.pseudo_thread_id=200;
+create temporary table t201 (id int);
+create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
+set @con1_id=connection_id();
+kill @con1_id;
+
+#now do something to show that slave is ok after DROP temp tables
+connection master;
+create table t1(f int);
+insert into t1 values (1);
+
+sync_slave_with_master;
+#connection slave;
+select * from t1 /* must be 1 */;
+
+connection master;
+drop table t1;
# End of 5.1 tests
| Thread |
|---|
| • bk commit into 5.1 tree (aelkin:1.2369) | Andrei Elkin | 25 Apr |
