List:Commits« Previous MessageNext Message »
From:holyfoot Date:January 23 2006 7:58am
Subject:bk commit into 5.1 tree (holyfoot:1.2081)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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.2081 06/01/23 11:58:14 holyfoot@deer.(none) +7 -0
  Fixes about the embedded-server in 5.1

  mysql-test/t/sp_notembedded.test
    1.2 06/01/23 11:58:08 holyfoot@stripped +2 -2
    test fixed

  mysql-test/t/log_tables.test
    1.2 06/01/23 11:58:08 holyfoot@stripped +2 -0
    test disabled in embedded server

  mysql-test/r/sp_notembedded.result
    1.2 06/01/23 11:58:08 holyfoot@stripped +171 -0
    result fixed

  mysql-test/r/mysqltest.result
    1.26 06/01/23 11:58:08 holyfoot@stripped +2 -2
    result fixed

  mysql-test/mysql-test-run.sh
    1.290 06/01/23 11:58:08 holyfoot@stripped +2 -0
    ndbcluster disabled in embedded server

  mysql-test/mysql-test-run.pl
    1.55 06/01/23 11:58:08 holyfoot@stripped +2 -0
    ndbcluster and ssl disabled in embedded server

  libmysqld/lib_sql.cc
    1.109 06/01/23 11:58:08 holyfoot@stripped +6 -0
    logger initialization added

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/5.1.emb

--- 1.289/mysql-test/mysql-test-run.sh	Tue Jan 17 11:25:44 2006
+++ 1.290/mysql-test/mysql-test-run.sh	Mon Jan 23 11:58:08 2006
@@ -317,6 +317,8 @@
       USE_EMBEDDED_SERVER=1
       USE_MANAGER=0 NO_SLAVE=1
       USE_RUNNING_SERVER=0
+      USE_NDBCLUSTER=""
+      USE_NDBCLUSTER_SLAVE=""
       TEST_MODE="$TEST_MODE embedded" ;;
     --purify)
       USE_PURIFY=1

--- 1.1/mysql-test/t/log_tables.test	Thu Jan 19 06:56:01 2006
+++ 1.2/mysql-test/t/log_tables.test	Mon Jan 23 11:58:08 2006
@@ -1,3 +1,5 @@
+# this test needs multithreaded mysqltest
+-- source include/not_embedded.inc
 #
 # Basic log tables test
 #

--- 1.1/mysql-test/r/sp_notembedded.result	Thu Jan 19 13:25:05 2006
+++ 1.2/mysql-test/r/sp_notembedded.result	Mon Jan 23 11:58:08 2006
@@ -33,3 +33,174 @@
 select bug5278()|
 ERROR 42000: Can't find any matching row in the user table
 drop function bug5278|
+drop table if exists t1|
+create table t1 (
+id   char(16) not null default '',
+data int not null
+)|
+drop procedure if exists bug3583|
+drop procedure if exists bug3583|
+create procedure bug3583()
+begin
+declare c int;
+select * from t1;
+select count(*) into c from t1;
+select c;
+end|
+insert into t1 values ("x", 3), ("y", 5)|
+set @x = @@query_cache_size|
+set global query_cache_size = 10*1024*1024|
+flush status|
+flush query cache|
+show status like 'Qcache_hits'|
+Variable_name	Value
+Qcache_hits	0
+call bug3583()|
+id	data
+x	3
+y	5
+c
+2
+show status like 'Qcache_hits'|
+Variable_name	Value
+Qcache_hits	0
+call bug3583()|
+id	data
+x	3
+y	5
+c
+2
+call bug3583()|
+id	data
+x	3
+y	5
+c
+2
+show status like 'Qcache_hits'|
+Variable_name	Value
+Qcache_hits	2
+set global query_cache_size = @x|
+flush status|
+flush query cache|
+delete from t1|
+drop procedure bug3583|
+drop table t1;
+#|
+drop procedure if exists bug6807|
+create procedure bug6807()
+begin
+declare id int;
+set id = connection_id();
+kill query id;
+select 'Not reached';
+end|
+call bug6807()|
+ERROR 70100: Query execution was interrupted
+call bug6807()|
+ERROR 70100: Query execution was interrupted
+drop procedure bug6807|
+drop function if exists bug10100f|
+drop procedure if exists bug10100p|
+drop procedure if exists bug10100t|
+drop procedure if exists bug10100pt|
+drop procedure if exists bug10100pv|
+drop procedure if exists bug10100pd|
+drop procedure if exists bug10100pc|
+create function bug10100f(prm int) returns int
+begin
+if prm > 1 then
+return prm * bug10100f(prm - 1);
+end if;
+return 1;
+end|
+create procedure bug10100p(prm int, inout res int)
+begin
+set res = res * prm;
+if prm > 1 then
+call bug10100p(prm - 1, res);  
+end if;
+end|
+create procedure bug10100t(prm int)
+begin
+declare res int;
+set res = 1;
+call bug10100p(prm, res);
+select res;
+end|
+create table t3 (a int)|
+insert into t3 values (0)|
+create view v1 as select a from t3;
+create procedure bug10100pt(level int, lim int)
+begin
+if level < lim then
+update t3 set a=level;
+FLUSH TABLES;
+call bug10100pt(level+1, lim);
+else
+select * from t3;
+end if;
+end|
+create procedure bug10100pv(level int, lim int)
+begin
+if level < lim then
+update v1 set a=level;
+FLUSH TABLES;
+call bug10100pv(level+1, lim);
+else
+select * from v1;
+end if;
+end|
+prepare stmt2 from "select * from t3;";
+create procedure bug10100pd(level int, lim int)
+begin
+if level < lim then
+select level;
+prepare stmt1 from "update t3 set a=a+2";
+execute stmt1;
+FLUSH TABLES;
+execute stmt1;
+FLUSH TABLES;
+execute stmt1;
+FLUSH TABLES;
+deallocate prepare stmt1;
+execute stmt2;
+select * from t3;
+call bug10100pd(level+1, lim);
+else
+execute stmt2;
+end if;
+end|
+create procedure bug10100pc(level int, lim int)
+begin
+declare lv int;
+declare c cursor for select a from t3;
+open c;
+if level < lim then
+select level;
+fetch c into lv;
+select lv;
+update t3 set a=level+lv;
+FLUSH TABLES;
+call bug10100pc(level+1, lim);
+else
+select * from t3;
+end if;
+close c;
+end|
+set @@max_sp_recursion_depth=255|
+set @var=1|
+call bug10100p(255, @var)|
+call bug10100pt(1,255)|
+call bug10100pv(1,255)|
+call bug10100pd(1,255)|
+call bug10100pc(1,255)|
+set @@max_sp_recursion_depth=0|
+deallocate prepare stmt2|
+drop function bug10100f|
+drop procedure bug10100p|
+drop procedure bug10100t|
+drop procedure bug10100pt|
+drop procedure bug10100pv|
+drop procedure bug10100pd|
+drop procedure bug10100pc|
+drop view v1|

--- 1.1/mysql-test/t/sp_notembedded.test	Wed Jan  4 14:18:55 2006
+++ 1.2/mysql-test/t/sp_notembedded.test	Mon Jan 23 11:58:08 2006
@@ -62,12 +62,12 @@
 
 
 --disable_warnings
-drop table if exists t1;
+drop table if exists t1|
 --enable_warnings
 create table t1 (
 	id   char(16) not null default '',
         data int not null
-);
+)|
 #
 # BUG#3583: query cache doesn't work for stored procedures
 #

--- 1.54/mysql-test/mysql-test-run.pl	Thu Jan 19 06:55:59 2006
+++ 1.55/mysql-test/mysql-test-run.pl	Mon Jan 23 11:58:08 2006
@@ -711,6 +711,8 @@
     $glob_use_embedded_server= 1;
     push(@glob_test_mode, "embedded");
     $opt_skip_rpl= 1;              # We never run replication with embedded
+    $opt_skip_ndbcluster= 1;       # Avoid auto detection
+    $opt_skip_ssl= 1;
 
     if ( $opt_extern )
     {

--- 1.25/mysql-test/r/mysqltest.result	Thu Jan 12 22:50:30 2006
+++ 1.26/mysql-test/r/mysqltest.result	Mon Jan 23 11:58:08 2006
@@ -1,6 +1,6 @@
-select -1 as "before_use_test" ;
+select 0 as "before_use_test" ;
 before_use_test
--1
+0
 select otto from (select 1 as otto) as t1;
 otto
 1

--- 1.108/libmysqld/lib_sql.cc	Wed Jan  4 14:18:53 2006
+++ 1.109/libmysqld/lib_sql.cc	Mon Jan 23 11:58:08 2006
@@ -491,6 +491,12 @@
 
   my_progname= (char *)"mysql_embedded";
 
+  /*
+    Perform basic logger initialization logger. Should be called after
+    MY_INIT, as it initializes mutexes. Log tables are inited later.
+  */
+  logger.init_base();
+
   if (init_common_variables("my", *argcp, *argvp, (const char **)groups))
   {
     mysql_server_end();
Thread
bk commit into 5.1 tree (holyfoot:1.2081)holyfoot23 Jan