Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2141 06/02/20 12:48:34 kent@stripped +1 -0
drop-on-restart.inc:
Added more DROP lines
mysql-test/include/drop-on-restart.inc
1.2 06/02/20 12:30:51 kent@stripped +179 -18
Added more DROP lines
# 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: kent
# Host: c-6f4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root: /Users/kent/mysql/bk/mysql-5.1-release
--- 1.1/mysql-test/include/drop-on-restart.inc 2006-02-20 00:24:37 +01:00
+++ 1.2/mysql-test/include/drop-on-restart.inc 2006-02-20 12:30:51 +01:00
@@ -42,6 +42,39 @@
drop database if exists testdb1;
drop database if exists testtets;
+drop event if exists e_26;
+drop event if exists e_43;
+drop event if exists event1;
+drop event if exists event2;
+drop event if exists event3;
+drop event if exists event3;
+drop event if exists non_qualif_ev;
+drop event if exists one_event;
+drop event if exists root10;
+drop event if exists root11;
+drop event if exists root12;
+drop event if exists root13;
+drop event if exists root13_1;
+drop event if exists root14;
+drop event if exists root15;
+drop event if exists root16;
+drop event if exists root17;
+drop event if exists root17_1;
+drop event if exists root18;
+drop event if exists root19;
+drop event if exists root20;
+drop event if exists root22;
+drop event if exists root6;
+drop event if exists root7;
+drop event if exists root8;
+drop event if exists root8_1;
+drop event if exists root9;
+drop event if exists three_event;
+drop event if exists two_event;
+
+drop function if exists `f``1`;
+drop function if exists `foo`;
+drop function if exists almost_empty;
drop function if exists append;
drop function if exists bug10015_1;
drop function if exists bug10015_2;
@@ -60,12 +93,15 @@
drop function if exists bug11555_2;
drop function if exists bug11834_1;
drop function if exists bug11834_2;
+drop function if exists bug12329;
drop function if exists bug12379;
+drop function if exists bug12480;
drop function if exists bug12712;
drop function if exists bug12812;
drop function if exists bug12953;
drop function if exists bug12995;
drop function if exists bug13012;
+drop function if exists bug13012_2;
drop function if exists bug131333;
drop function if exists bug13825_0;
drop function if exists bug13825_1;
@@ -75,6 +111,8 @@
drop function if exists bug13825_5;
drop function if exists bug13941;
drop function if exists bug14233;
+drop function if exists bug14233_1;
+drop function if exists bug14233_2;
drop function if exists bug14270;
drop function if exists bug14723;
drop function if exists bug2267_4;
@@ -82,7 +120,10 @@
drop function if exists bug2564_4;
drop function if exists bug2674;
drop function if exists bug2772;
+drop function if exists bug2773;
drop function if exists bug3132;
+drop function if exists bug3287;
+drop function if exists bug3788;
drop function if exists bug4487;
drop function if exists bug5240;
drop function if exists bug5278;
@@ -91,6 +132,7 @@
drop function if exists bug7049_1;
drop function if exists bug7049_2;
drop function if exists bug7648;
+drop function if exists bug8408;
drop function if exists bug8408_f;
drop function if exists bug8409;
drop function if exists bug8861;
@@ -100,6 +142,7 @@
drop function if exists bug9102;
drop function if exists bug9559;
drop function if exists bug9775;
+drop function if exists bug9902;
drop function if exists bug_13627_f;
drop function if exists bug_9503;
drop function if exists chistics;
@@ -118,10 +161,15 @@
drop function if exists f7;
drop function if exists f8;
drop function if exists f9;
+drop function if exists f;
drop function if exists f_bug11247;
drop function if exists fac;
+drop function if exists fn1;
+drop function if exists fn3;
drop function if exists foo;
drop function if exists fun;
+drop function if exists func1;
+drop function if exists getcount;
drop function if exists inc;
drop function if exists mul;
drop function if exists sp_vars_check_ret1;
@@ -130,10 +178,24 @@
drop function if exists sp_vars_check_ret4;
drop function if exists sub1;
drop function if exists sub2;
+drop function if exists sub3;
+drop function if exists t1max;
+drop function if exists t_slow_sysdate;
drop function if exists test.f1;
+drop function if exists x1;
+drop function if exists x;
+
+#drop index if exists b on t1;
+#drop index if exists id on t2;
+#drop index if exists id2 on t2;
-drop procedure if exists BUG3259_2 ;
-drop procedure if exists Bug3259_3 ;
+drop procedure if exists BUG3259_2;
+drop procedure if exists BUG3259_3;
+drop procedure if exists BuG3259_2;
+drop procedure if exists Bug3259_3;
+drop procedure if exists bUg3259_1;
+drop procedure if exists bug3259_1;
+drop procedure if exists SP001;
drop procedure if exists ` bug15658`;
drop procedure if exists `a'b`;
drop procedure if exists a0;
@@ -141,6 +203,7 @@
drop procedure if exists avg;
drop procedure if exists b2;
drop procedure if exists b;
+drop procedure if exists bad_into;
drop procedure if exists bar;
drop procedure if exists bug10015_8;
drop procedure if exists bug10100p;
@@ -172,6 +235,7 @@
drop procedure if exists bug12979_1;
drop procedure if exists bug12979_2;
drop procedure if exists bug13012;
+drop procedure if exists bug13012_1;
drop procedure if exists bug13037_p1;
drop procedure if exists bug13037_p2;
drop procedure if exists bug13037_p3;
@@ -190,7 +254,9 @@
drop procedure if exists bug13825_2;
drop procedure if exists bug13941;
drop procedure if exists bug14210;
+drop procedure if exists bug14210_fill_table;
drop procedure if exists bug14233;
+drop procedure if exists bug14233_3;
drop procedure if exists bug14304;
drop procedure if exists bug14376;
drop procedure if exists bug14498_1;
@@ -203,6 +269,7 @@
drop procedure if exists bug14723;
drop procedure if exists bug14840_1;
drop procedure if exists bug14840_2;
+drop procedure if exists bug14845;
drop procedure if exists bug1495;
drop procedure if exists bug15011;
drop procedure if exists bug15091;
@@ -212,21 +279,29 @@
drop procedure if exists bug15231_4;
drop procedure if exists bug15441;
drop procedure if exists bug1547;
+drop procedure if exists bug1653;
drop procedure if exists bug1656;
drop procedure if exists bug1862;
drop procedure if exists bug1863;
drop procedure if exists bug1874;
+drop procedure if exists bug1965;
drop procedure if exists bug2227;
+drop procedure if exists bug2259;
drop procedure if exists bug2260;
drop procedure if exists bug2267_1;
drop procedure if exists bug2267_2;
drop procedure if exists bug2267_3;
drop procedure if exists bug2267_4;
+drop procedure if exists bug2272;
+drop procedure if exists bug2329_1;
+drop procedure if exists bug2329_2;
drop procedure if exists bug2460_1;
drop procedure if exists bug2460_2;
drop procedure if exists bug2564_1;
drop procedure if exists bug2564_2;
drop procedure if exists bug2614;
+drop procedure if exists bug2653_1;
+drop procedure if exists bug2653_2;
drop procedure if exists bug2656_1;
drop procedure if exists bug2656_2;
drop procedure if exists bug2773;
@@ -234,14 +309,16 @@
drop procedure if exists bug2776_2;
drop procedure if exists bug2780;
drop procedure if exists bug3157;
-drop procedure if exists bug3259_1 ;
+drop procedure if exists bug3259_1;
+drop procedure if exists bug3279;
+drop procedure if exists bug3287;
drop procedure if exists bug3294;
drop procedure if exists bug3368;
drop procedure if exists bug336;
drop procedure if exists bug3426;
drop procedure if exists bug3448;
drop procedure if exists bug3583;
-drop procedure if exists bug3734 ;
+drop procedure if exists bug3734;
drop procedure if exists bug3788;
drop procedure if exists bug3843;
drop procedure if exists bug3863;
@@ -253,6 +330,7 @@
drop procedure if exists bug4902_2;
drop procedure if exists bug4904;
drop procedure if exists bug4905;
+drop procedure if exists bug4934;
drop procedure if exists bug4941;
drop procedure if exists bug5251;
drop procedure if exists bug5258;
@@ -260,6 +338,8 @@
drop procedure if exists bug5287;
drop procedure if exists bug5307;
drop procedure if exists bug5963;
+drop procedure if exists bug5963_1;
+drop procedure if exists bug5963_2;
drop procedure if exists bug5967;
drop procedure if exists bug6029;
drop procedure if exists bug6063;
@@ -279,9 +359,15 @@
drop procedure if exists bug7049_4;
drop procedure if exists bug7088_1;
drop procedure if exists bug7088_2;
+drop procedure if exists bug7291_0;
+drop procedure if exists bug7291_1;
+drop procedure if exists bug7291_2;
drop procedure if exists bug7293;
drop procedure if exists bug7299;
drop procedure if exists bug7743;
+drop procedure if exists bug7992;
+drop procedure if exists bug7992_1;
+drop procedure if exists bug7992_2;
drop procedure if exists bug8116;
drop procedure if exists bug822;
drop procedure if exists bug8408_p;
@@ -328,14 +414,22 @@
drop procedure if exists cur1;
drop procedure if exists cur2;
drop procedure if exists d;
+drop procedure if exists db1_secret.dummy;
drop procedure if exists dummy;
drop procedure if exists e;
drop procedure if exists empty;
drop procedure if exists f1;
+drop procedure if exists f2;
+drop procedure if exists f3;
+drop procedure if exists f4;
drop procedure if exists f;
drop procedure if exists fib;
drop procedure if exists fn3;
+drop procedure if exists foo2;
+drop procedure if exists foo3;
drop procedure if exists foo42;
+drop procedure if exists foo4;
+drop procedure if exists foo;
drop procedure if exists g;
drop procedure if exists goto1;
drop procedure if exists goto2;
@@ -356,6 +450,7 @@
drop procedure if exists into_dumpfile;
drop procedure if exists into_outfile;
drop procedure if exists into_tes2;
+drop procedure if exists into_test2;
drop procedure if exists into_test3;
drop procedure if exists into_test4;
drop procedure if exists into_test;
@@ -364,18 +459,20 @@
drop procedure if exists locset;
drop procedure if exists mixset;
drop procedure if exists modes;
+drop procedure if exists mysqltest.sp1;
drop procedure if exists mysqltest1.p1;
drop procedure if exists mysqltest1.p2;
+drop procedure if exists mysqltest_1.p1;
drop procedure if exists nullset;
drop procedure if exists opp;
+drop procedure if exists p108;
drop procedure if exists p1;
drop procedure if exists p2;
-drop procedure if exists p3;
-drop procedure if exists p4;
-drop procedure if exists p5;
-drop procedure if exists p6;
drop procedure if exists p;
drop procedure if exists p_bug11247;
+drop procedure if exists proc1;
+drop procedure if exists px5;
+drop procedure if exists q;
drop procedure if exists rc;
drop procedure if exists scope;
drop procedure if exists sel1;
@@ -387,22 +484,26 @@
drop procedure if exists sp4;
drop procedure if exists sp_vars_check_assignment;
drop procedure if exists sp_vars_check_dflt;
+drop procedure if exists sptest.p1;
drop procedure if exists sub1;
drop procedure if exists sub2;
drop procedure if exists sub3;
drop procedure if exists sudoku_solve;
+drop procedure if exists t1;
+drop procedure if exists t_sysdate;
drop procedure if exists test.longprocedure;
-drop procedure if exists test.p1;
-drop procedure if exists test.p2;
-drop procedure if exists test.p3;
-drop procedure if exists test.p4;
-drop procedure if exists test.p5;
-drop procedure if exists test.p6;
-drop procedure if exists test.p7;
drop procedure if exists two;
+drop procedure if exists wg2;
drop procedure if exists zap;
drop procedure if exists zip;
+drop schema if exists foo;
+drop schema if exists mysqltest1;
+drop schema if exists mysqltest2;
+drop schema if exists mysqltest3;
+
+drop table if exists 1ea10;
+drop table if exists Sow6_2f;
drop table if exists T1;
drop table if exists `"t"1`,t1aa,t2aa;
drop table if exists ```a`;
@@ -410,26 +511,39 @@
drop table if exists `t1a``b`,v1,v2,v3,v4,v5,v6;
drop table if exists `t2 test`;
drop table if exists a;
+drop table if exists atablewithareallylongandirritatingname;
drop table if exists bug13095_t1;
drop table if exists bug13894;
drop table if exists bug14672;
+drop table if exists bug16905;
+drop table if exists events;
drop table if exists federated.alter_me;
drop table if exists federated.archive_table;
drop table if exists federated.bug_13118_table;
drop table if exists federated.normal_table;
drop table if exists federated.t1;
drop table if exists gis_point,gis_line,gis_polygon,gis_multi_point,gis_multi_line,gis_multi_polygon,gis_geometrycollection,gis_geometry;
+#drop table if exists information_schema.tables;
+drop table if exists join_test;
+drop table if exists mysqltest.t1;
+drop table if exists mysqltest.t9;
+drop table if exists mysqltest.test2$;
+drop table if exists mysqltest.v3;
drop table if exists mysqltest1.t1;
drop table if exists mysqltest1.t2;
drop table if exists mysqltest1.t3;
drop table if exists mysqltest1.t4;
+drop table if exists mysqltest_1.t1;
drop table if exists mysqltest_bar;
drop table if exists mysqltest_foo;
drop table if exists new_t2;
+drop table if exists non_qualif;
drop table if exists not_exist;
+drop table if exists not_exists_table;
+drop table if exists nu;
drop table if exists r1;
-drop table if exists t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t21,t70;
-drop table if exists t0_template;
+drop table if exists t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38,t39,t40,t41,t42,t43,t44,t45,t46,t47,t48,t49,t50,t51,t52,t53,t54,t55,t56,t57,t58,t59,t60,t61,t62,t63,t64,t65,t66,t67,t68,t69,t70,t71,t72,t73,t74,t75,t76,t77,t78,t79,t80,t81,t82,t83,t84,t85,t86,t87,t88,t89,t90,t91,t92,t93,t94,t95,t96,t97,t98,t99,t100,t101,t102,t103,t104,t105,t106,t107,t108,t109,t110,t111,t112,t113,t114,t115,t116,t117,t118,t119,t120,t121,t122,t123,t124,t125,t126,t127,t128,t129,t130,t131,t132,t133,t134,t135,t136,t137,t138,t139,t140,t141,t142,t143,t144,t145,t146,t147,t148,t149,t150,t151,t152,t153,t154,t155,t156,t157,t158,t159,t160,t161,t162,t163,t164,t165,t166,t167,t168,t169,t170,t171,t172,t173,t174,t175,t176,t177,t178,t179,t180,t181,t182,t183,t184,t185,t186,t187,t188,t189,t190,t191,t192,t193,t194,t195,t196,t197,t198,t199,t200,t201,t202,t203,t204,t205,t206,t207,t208,t209,t210,t211,t212,t213,t214,t21
5,t216,t217,t218,t219,t220,t221,t222,t223,t224,t225,t226,t227,t228,t229,t230,t231,t232,t233,t234,t235,t236,t237,t238,t239,t240,t241,t242,t243,t244,t245,t246,t247,t248,t249,t250,t251,t252,t253,t254,t255,t256,t257,t00;
+drop table if exists t0_template,t04;
drop table if exists t1Aa,t2Aa,v1Aa,v2Aa;
drop table if exists t1_1,t1_2,t9_1,t9_2,t1aa,t2aa;
drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
@@ -451,14 +565,61 @@
#drop trigger if exists test.t2_au;
#drop trigger if exists test.t3_bi_t2;
+#drop user if exists "zedjzlcsjhd"@127.0.0.1;
+#drop user if exists '%@a'@'a';
+#drop user if exists 'mysqltest_1','mysqltest_2','mysqltest_3';
+#drop user if exists 'mysqltest_1','mysqltest_3';
+#drop user if exists 'mysqltest_1';
+#drop user if exists 'mysqltest_1'@'localhost';
+#drop user if exists 'mysqltest_1a','mysqltest_2a','mysqltest_3a';
+#drop user if exists 'mysqltest_1b','mysqltest_2b','mysqltest_3b';
+#drop user if exists 'mysqltest_2' identified by 'Mysqltest-2';
+#drop user if exists 'mysqltest_2';
+#drop user if exists drop_user@localhost,drop_user1@localhost,drop_user2@localhost,drop_user3@localhost,drop_user4@localhost;
+#drop user if exists ev_test@localhost;
+#drop user if exists grant_user@localhost;
+#drop user if exists mysqltest_1@host1,mysqltest_2@host2,mysqltest_4@host4,mysqltest_5@host5, mysqltest_6@host6, mysqltest_7@host7;
+#drop user if exists mysqltest_1@localhost;
+#drop user if exists mysqltest_2@localhost;
+#drop user if exists mysqltest_3@host3;
+#drop user if exists mysqltest_3@localhost;
+#drop user if exists mysqltest_7@;
+#drop user if exists mysqltest_A@'%';
+#drop user if exists mysqltest_B@'%';
+#drop user if exists mysqltest_C@'%';
+#drop user if exists rpl_do_grant2@localhost;
+#drop user if exists second_user@localhost;
+#drop user if exists test14256;
+#drop user if exists test@localhost;
+#drop user if exists user1@localhost,user2@localhost,user3@localhost,user4@localhost;
+#drop user if exists user1_bug14834@localhost;
+#drop user if exists user2_bug14834@localhost;
+#drop user if exists user3148@localhost;
+#drop user if exists user3_bug14834@localhost;
+#drop user if exists user_bug14533@localhost;
+
+drop view if exists `t1a``b`;
+drop view if exists `v 1`;
+drop view if exists a2,a1;
+drop view if exists abc;
drop view if exists bug13095_v1;
drop view if exists mysqltest1.v1;
drop view if exists mysqltest1.v2;
drop view if exists mysqltest1.v3;
drop view if exists mysqltest1.v4;
-drop view if exists t1,t2,`t1a``b`;
+drop view if exists t1,t2,v1,v2,v3;
drop view if exists t1Aa,t2Aa,v1Aa,v2Aa;
+drop view if exists test.v1;
drop view if exists v0,v1,v2,v3,v4,v5,v6;
+drop view if exists v100;
+drop view if exists v1AA;
+drop view if exists v1a,v1b,v1c,v1d;
+drop view if exists v2 CASCADE;
+drop view if exists v2a,v2b;
+drop view if exists v3 RESTRICT;
+drop view if exists v3a,v3b;
+drop view if exists v3aA,v2Aa,v1aA;
+drop view if exists vo;
--enable_query_log
--enable_warnings
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.2141) | kent | 20 Feb |
