From 0edca87cdbefa1101741c7868ed20bcfd6b96c2e Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Mon, 8 Apr 2013 19:03:03 +0000 Subject: [PATCH] refs #6372 add mysql upgrade tests from 6.6.8 to riddler git-svn-id: file:///svn/mysql/tests/mysql-test@55211 c7de825b-a66e-492c-adef-691d508d4ae1 --- .../data/__tokudb_lock_dont_delete_me_data | 0 .../__tokudb_lock_dont_delete_me_environment | 0 .../data/__tokudb_lock_dont_delete_me_logs | 0 .../data/__tokudb_lock_dont_delete_me_temp | 0 .../data/__tokudb_recoverylock_dont_delete_me | 0 .../data/_test_ta_P_p0_key_b_9_17.tokudb | Bin 0 -> 32768 bytes .../data/_test_ta_P_p0_main_8_17.tokudb | Bin 0 -> 32768 bytes .../data/_test_ta_P_p0_status_7_17.tokudb | Bin 0 -> 65536 bytes .../data/_test_ta_P_p1_key_b_d_17.tokudb | Bin 0 -> 32768 bytes .../data/_test_ta_P_p1_main_c_17.tokudb | Bin 0 -> 32768 bytes .../data/_test_ta_P_p1_status_b_17.tokudb | Bin 0 -> 65536 bytes .../data/lex1.tokutek.com.err | 38 ++++++++++ .../data/log000000000000.tokulog23 | Bin 0 -> 24754 bytes .../data/test/ta.frm | Bin 0 -> 8602 bytes .../data/test/ta.par | Bin 0 -> 28 bytes .../data/tokudb.directory | Bin 0 -> 32768 bytes .../data/tokudb.environment | Bin 0 -> 16384 bytes .../data/tokudb.rollback | Bin 0 -> 32768 bytes .../data/tokudb_meta_3_17.tokudb | Bin 0 -> 32768 bytes .../data/__tokudb_lock_dont_delete_me_data | 0 .../__tokudb_lock_dont_delete_me_environment | 0 .../data/__tokudb_lock_dont_delete_me_logs | 0 .../data/__tokudb_lock_dont_delete_me_temp | 0 .../data/__tokudb_recoverylock_dont_delete_me | 0 .../data/_test_ta_main_8_17.tokudb | Bin 0 -> 32768 bytes .../data/_test_ta_status_7_17.tokudb | Bin 0 -> 16384 bytes .../data/_test_tb_key_b_e_17.tokudb | Bin 0 -> 32768 bytes .../data/_test_tb_main_d_17.tokudb | Bin 0 -> 32768 bytes .../data/_test_tb_status_c_17.tokudb | Bin 0 -> 32768 bytes .../data/log000000000000.tokulog23 | Bin 0 -> 21391 bytes .../data/test/ta.frm | Bin 0 -> 8578 bytes .../data/test/tb.frm | Bin 0 -> 8578 bytes .../data/tokudb.directory | Bin 0 -> 32768 bytes .../data/tokudb.environment | Bin 0 -> 16384 bytes .../data/tokudb.rollback | Bin 0 -> 32768 bytes .../data/tokudb_meta_3_17.tokudb | Bin 0 -> 16384 bytes .../r/tokudb_drop_simple_table_668.result | 33 +++++++++ .../t/tokudb_drop_part_table_668.test | 67 +++++++++++++++++ .../t/tokudb_drop_simple_table_668.test | 69 ++++++++++++++++++ 39 files changed, 207 insertions(+) create mode 100644 mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_data create mode 100644 mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_environment create mode 100644 mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_logs create mode 100644 mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_temp create mode 100644 mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_recoverylock_dont_delete_me create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p0_key_b_9_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p0_main_8_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p0_status_7_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p1_key_b_d_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p1_main_c_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p1_status_b_17.tokudb create mode 100644 mysql-test/std_data/tokudb_drop_part_table_668/data/lex1.tokutek.com.err create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/log000000000000.tokulog23 create mode 100644 mysql-test/std_data/tokudb_drop_part_table_668/data/test/ta.frm create mode 100644 mysql-test/std_data/tokudb_drop_part_table_668/data/test/ta.par create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb.directory create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb.environment create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb.rollback create mode 100755 mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb_meta_3_17.tokudb create mode 100644 mysql-test/std_data/tokudb_drop_simple_table_668/data/__tokudb_lock_dont_delete_me_data create mode 100644 mysql-test/std_data/tokudb_drop_simple_table_668/data/__tokudb_lock_dont_delete_me_environment create mode 100644 mysql-test/std_data/tokudb_drop_simple_table_668/data/__tokudb_lock_dont_delete_me_logs create mode 100644 mysql-test/std_data/tokudb_drop_simple_table_668/data/__tokudb_lock_dont_delete_me_temp create mode 100644 mysql-test/std_data/tokudb_drop_simple_table_668/data/__tokudb_recoverylock_dont_delete_me create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/_test_ta_main_8_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/_test_ta_status_7_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/_test_tb_key_b_e_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/_test_tb_main_d_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/_test_tb_status_c_17.tokudb create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/log000000000000.tokulog23 create mode 100644 mysql-test/std_data/tokudb_drop_simple_table_668/data/test/ta.frm create mode 100644 mysql-test/std_data/tokudb_drop_simple_table_668/data/test/tb.frm create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/tokudb.directory create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/tokudb.environment create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/tokudb.rollback create mode 100755 mysql-test/std_data/tokudb_drop_simple_table_668/data/tokudb_meta_3_17.tokudb create mode 100644 mysql-test/suite/tokudb.bugs/r/tokudb_drop_simple_table_668.result create mode 100644 mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test create mode 100644 mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_data b/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_data new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_environment b/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_environment new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_logs b/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_logs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_temp b/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_lock_dont_delete_me_temp new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_recoverylock_dont_delete_me b/mysql-test/std_data/tokudb_drop_part_table_668/data/__tokudb_recoverylock_dont_delete_me new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p0_key_b_9_17.tokudb b/mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p0_key_b_9_17.tokudb new file mode 100755 index 0000000000000000000000000000000000000000..8bb02b12a42449feb2ad7a714d76802c438d0544 GIT binary patch literal 32768 zcmeI(y-Hj`6ae7aAO8v=YoV23YqxD8L=jsFf+8XqcF{BuY}Pi21Z!Ww7w`?l!e_{$ z^}c|83L)#6x!%Gqc3XS{bIzHW-DUZ@J2Q81_VfI>H|V95mQs2eM!uV!nVxF5nvJMa z36a9lT5maiAPt|Y!MB(GPOj=aU8bAW;s;}6JRYw{AJ^YIyk5SkYncE6 z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBmFU&3HMdZU@zk=kjspyXr!*;2h- z0cdvG+5`xlR4;Fu4<{g2#vid2fi`xikFBV6C`uDlk z2oNAZfB*pk1PBlyK!5;&2@uF9`T1$SZvUcq_qR5xQT@Ju*$jxOyhl)4w@Tk5{e67+ zRgFXf1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U cAV7cs0RjXF5FkK+009C72oNAZ;C}^P0T)6;WB>pF literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p0_main_8_17.tokudb b/mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p0_main_8_17.tokudb new file mode 100755 index 0000000000000000000000000000000000000000..1f354a11eaecc38971a86217cef614d5823cf3f5 GIT binary patch literal 32768 zcmeI(y-EW?5CGtf#=p*3C@0!^TG%KNwNbE%tpxF9v`--xK7)bO>3j*n zIGb||JMBcih1r?e%N^nCvbX76U*4RxJMEOxQc8n<8bkUL@nwxo+5ANCN;-% zNe5MzCckn#AoT}Tv-f_wpR1Cm$IBDd#b3^~(P*?CF)H`ft{!$vEfXL>fB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009DNAq?gs;yr&oP358*xFw|&U*x_5gV<>>TF8gD2KI_59A*$ z-rqH%%{vGit@)g~k1?ggxHx=0wTX~13<3lQ5FkK+009C72oNCf7XzZnM{l_B_Ru zp5EJivi)%$zq7UtYc@3}+7e2s(Mnwyl=6hH!0Ry$U6Z;>Wl~0+6Vu7$XiDX(-7S=n zF69Ag@Pd1?=-1?8r1Go5E1HxLsF8R6wMdYyjo1_ zSKg2=qX*WYuBy(?Ej4z2cTjF~Ab~wGT4Cu}Ex2WK zt+ji)QkRV4kT0NDc}o}E(_b>6F7-C`DK&S2=K&dCkO79UZ7My5nHKjjN z8wi`bM*6JTWmUBerfzBKa7SNFnPn=wzM(E&+pyeD+Q)(_^_uIlt)FUY#`lG)H6g(f z)>Cb(+g5K_KXG=rzP4d$-O{>63&V4lhv(NWnIA4sOu1x#WcfQiOTsgD1@+tczFRMA zs#8h+SM z@rwGUO$C-zl_#bRDlMdYgT4u-*SOzrO5NX|3fG@7_2|c+UD-doMA{WfipGOZVV#sr z&6BwPSqoR5ESLH;NzwS^X*G`-)=3#fP_lGDc{=o%Jk}pHV@4n;7v=Kh&3m>DJ^Do6 z2c}w*A%Fk^2q1s}0tg_000IagfPe_(oBx;DcvXI@>;ET7V|V@k#7b-Yu=W35nfV`; zTK*qOE&o6A=C~t!(MJFQ1Q0*~0R#|0009ILKmdWeDo`MAbGFyd979qW_63^Uv-Whm ztot?Y{fllPYxLd9)0uN;v49+#-9jm6U_p)o2@WX#r0k4)Mvedi2q1s}0tg_000Iag zfB*t_N+93-f3GaTKa?Z>U)KA(`~L;HY(abLuV|38qfSr3}quG-n&!3P&^j_1Q0*~0R#|0009ILK;T~~kgxwAlW)8t z$NK-Q{{O?$xKUCx9&NPN9q-7s^PlE-{w099(@c&l3Rv<1IV@E&xpCu}wu9%~b8-X_ zKmY**5I_I{1Q0*~0R#~ETLo^k|DVinOPAc;|L>J_`F^_mDqX(5xO2xWsjre0jn7=w zwCtHJQXRezpzPTfGLqZ9-Nk#o9mV~sAf$VwO^IJJ>x-6iBf9mxTln3fo6h&-KmY** z5I_I{1Q0*~0R#|0;QuDzlOH$}`|p%l@%>${$nJEztotvz_piFe&Ex+qx8Vz!_N{K^ zX9*l=?K|I_xlD-w0tg_000IagfB*srAb_dNGp62fnL@9v!)efsi#GMkiAHcPp=ig?~%U0Loebvu!l zIz)Vtld@aKHZ-+TmYQn*K)JeUCWpVK8w%?Kb^S5@JS^K_!-3*9Q?h({BYQozHKd zo0*XS0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 b2oNAZfB*pk1PBlyK!5-N0t5&U_+NoP1wliW literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p1_main_c_17.tokudb b/mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p1_main_c_17.tokudb new file mode 100755 index 0000000000000000000000000000000000000000..ba8fe5b04c87da14eaaa4a92aef5c14b939128cb GIT binary patch literal 32768 zcmeI(y)HyS6ae5^yX&t)K_ZcO16mED7ug`9A-h3CqFJ4YhzC*Yw-AMAAW`cy9zkNA z*=q_Noya%InRCwEy*Hb$+qtvd)8n&)cDJ2Unn~&TDe~Ru$Z)e!AF4&222ejA0NUK!5-N0t5&UAV7csfxjS--}vWW^JRQQ z@$Gx9R$ckO|6ns9mS)R`7OP@E(!%S*MOl^!5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7csfu9L{0(nkD A+yDRo literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p1_status_b_17.tokudb b/mysql-test/std_data/tokudb_drop_part_table_668/data/_test_ta_P_p1_status_b_17.tokudb new file mode 100755 index 0000000000000000000000000000000000000000..713373ac4978a61beae5c41471232d4f6ea2a1fd GIT binary patch literal 65536 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 literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/test/ta.frm b/mysql-test/std_data/tokudb_drop_part_table_668/data/test/ta.frm new file mode 100644 index 0000000000000000000000000000000000000000..8777e4ff525c6262f78e44d8bfe47efcfbfbc106 GIT binary patch literal 8602 zcmeI&F>b;z6b9hm&uLVkNDQb8i>ofB3l-{)!bFBb6j<0Am{{7X;s7~E@54nnNZn_M zsDv0gbO7o1V)>6{y?jzKJo($y+7@UT;0f5;CJsZMaSdFBwa)vo)xED9V7Ln(fnE=A z)k97cpa2CZKmiI+fC3bt00k&O0ScU_fCzA-rA5#V08FXNjxLfakTTYwjNr38eM$1U zU-lVD1ohBlsRCbUk7eoc191f^uK)l5 literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/test/ta.par b/mysql-test/std_data/tokudb_drop_part_table_668/data/test/ta.par new file mode 100644 index 0000000000000000000000000000000000000000..95e5478cccb45998905de56e2914a5a931b07795 GIT binary patch literal 28 fcmZQ)U|`6QVklq&(pp*!3~WHUz<{B^5J&?6BX9zj literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb.directory b/mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb.directory new file mode 100755 index 0000000000000000000000000000000000000000..33fb79de2208143dce9850f7e9072b371fc2db69 GIT binary patch literal 32768 zcmeI)Pe_wt9KiAC-R36d@>Oh-6qth@#LbDJ&d?NM;lw|gXb}1OP8XC}178nyX#p$j3ZgxE;Q_^jCFEOOXwip+)G?BsDV(|2Zi5wyaP6*6-iGM5X8)Q0up zt*z)eGrRi3ikZcP%^J-1u5653g9T&xCrUb0K$CHgscVx=npqq_r%liZiIFwomHY$nBqvgTazy>%G>5)AqQs zaq#3sw9@WQl`6B%J$|v?JnZ>we^oEm+s1vKQjf>k-cv6I+vhwZZeQY(qu(zEyQ03T zLltfjK3c8zIkl;np*u$&*tMqG!*%c0&OaIU-j!dG0|5jOKmY**5I_I{1Q0*~f&WLq ze0Se`y*_tr%cS7$^WOJ2=ln5VW6eG#9~`)+BCiXsl-2vo=9>gcX;^V8Rxv+Q zM;G=pNl`6?tjz}+?#Q^{(wfYIf1g8yx*}t1&&yxP>o^cV009ILKmY**5I_I{1Q0;r zAO-fV|L6VQf5-ZNr*${;GAz|@FCOH*u@(XdAb0@>+|@va(&P79i>!4scuK|U3A(43`rmZlkh-6Db9#EZb__NU~=JaZi!*|SZ^J~`k^jHbg$k_;jU{xZ} zC-kL<&cf-)(`+Ds00IagfB*srAbn8pxzzT&7uytJam^21Q0*~0R#|0009ILKmY** I5cqR}Po(Ey`~Uy| literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb.rollback b/mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb.rollback new file mode 100755 index 0000000000000000000000000000000000000000..7a73b4b898bcff1db7729e1b595aa7886ca2ea73 GIT binary patch literal 32768 zcmeI&Jxd%x7y#foKQ7v-g;v6)vK6cp)I+dLVPPRc!ilCx0%^`h5hSFw_cx>!6tVRW zoM5Z}L&3|;&aIqY{Awh{Gcfbc?##{(PxtO@^XK>N%|^2kLYN5Q@*>95p%2x;f&RWq z?1%o;#Ijzr^`Z^aIW%*)pA#1d7nk|w&dtV3>V3P-G2iXW;f-yj-EJ?&+Ag1K9UbhI zeUShG0t5&UAV7cs0RjXF5O`6b`9l6*X6&QIO7*;6Cv4`cXY>E#&Ub)3wOp<9;44E< z{(pGByZp*$O(Q^n009C72oNAZfB*pk1VTvp|BtQ4*K~GYp5Lc~|D{+bV_jI8{yY|A zE!NpjqqU(B_G9C3=yF*=gM{-4-{)i`+F+Bi#ng#ZBp1PBlyK!5-N z0t5&U_zwiCaSth*FUwu*JlIy(|Nd!C&v-4*{?b{ed;IbIk0*0857u@;fB*pk1PBly zK!5-N0t5)Wi@;!fOUl#B(w)B-8>r`Pr2qZXoSyMo9{*SVKXo;Kn@6<-2oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs Q0RjXF5FkK+z*7Q$0nMC|iU0rr literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb_meta_3_17.tokudb b/mysql-test/std_data/tokudb_drop_part_table_668/data/tokudb_meta_3_17.tokudb new file mode 100755 index 0000000000000000000000000000000000000000..78ff3f732e65a4fe45ffce5bc54fbb949a1591e8 GIT binary patch literal 32768 zcmeI(O-ma=7{KvoqsA9dqX*j_ghlTfOD|f`;6bS8&?o4vBQKPG+bEv_s67jWp=7>qie{Nb|Gj9e|hocD-{Jd5&qJwA0xkJz^+5I_I{1Q0*~0R#|00D)H^P_Ab%xB2L~(ni6tZoThs=G+^1?d&NH-*W@U1#9Ub zfB*srAb5nM%m07Ull5!KX#W45MpsMc&|7!f=Km$u=UhmQ{Cw28k9SCoei7hr)Yet{ zx=7^c&-nY_E9YZjhYA4%5I_I{1Q0*~0R#|0009J^U7%$C|JL{Z59a?<_DEYAc3ZA? zpZ$PrhyVfzAbP!zO2kH|xu5q4RwG*5^Q$u{4WoRmrF|*Vy#7RDY;Nxs<@=$cr-;S zg_Nr8;83KZgCK$qB8VVj2De1A>LxlUq9C-?Jby2Lz|%!s9Q;0b@ArH6e)j^OOvihr zi?eexe#s}IT||vK$0v5wikOBJoKtJynA8(f58Tr2Fx3uZbRus+^+tO#`?`2iXWeME z9?SM(XY6kGu(f$;DKrsEsUzH#eyU$;Y#+>oDlmZn1Rwwb2tWV=5P$##AOHafKmY;| zfB*y_009U<00Izz00bZa0SNrx0wq5GKY!Lgr_b)Y=lA-|KgWHQljT$C=>g6??jz&7 zy#i6dDVbUEh4i8R;YUg}?r+_`%Ef#4aM6jyP8K}=e)pa}t`~MzSRyN`WcA9+L0xV* z#x--znYrmyX+0L3<&oIUoqGePOrT~Capxir@HeMZQd%pBpN&& zNu_98Jy;-bEow9c{cSJ56|{87j(O(wK0A={Pf?T9L=b(iCUfIQC(o$7)7tujpp8ow zO|ewwSjC7>TYvJ4Lsp{vYhC%9pm{;=vq<@?;HwpqMyY?;8LGHM6UY0WyQ5@CS&;9p zB=&orXRHYNn2~;MK^DoB@%WrrUUkWc-*L0%iWppa%2D~M*u#H{+E;h`y|FD literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_simple_table_668/data/_test_tb_key_b_e_17.tokudb b/mysql-test/std_data/tokudb_drop_simple_table_668/data/_test_tb_key_b_e_17.tokudb new file mode 100755 index 0000000000000000000000000000000000000000..1c82b1b4ea304676a561071db114ba4b932b2789 GIT binary patch literal 32768 zcmeI(ze*fI7y$6u^O7hcMmb4r6l_lHM1uGRd5Mr02q{wK z0dmn&d<;7`-?!@)>5|UkH!$Cy8SXfK-OkQUj}K2iOs11k%CMB{S>$i?&z?T%&-JRP zOA{i$%%+T**rlDeD{~JyzM#ym+vfE5{&rSfUTl_o?dE^Rs;=u-G3)MgH^ZM_yILkd zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7%4QfW#jJXzAE{r~8kBtPpM8$z z3P5krZ(iOHawT`(Wcd8{av>KC0t5&UAV7cs0RjXF5FkL{F$+xN{{PX($wA)T@9yvC z1OMxoD>1jW*LPn;UX8gi9<0unavtSvRq{gq`{j#Ic_NU902|}yna;mNDDPtP_SgRR ztPKJL2oNAZfB*pk1PBlyK;RJwQok4ZexflxRv#UyMV*FIbq;whOOD*LC`8#vh zS2NM(9fXzEbWWEyF{SOe`0})G6Cq<51PBlyK!5-N0t5&UAVA?c{_j8B42Y$L@}cFb*o(CE_IOd2WdZ~U5FkK+009C72oNAZfB*pk1PBlyK!5-N x0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAVA<}0-xz3L*D=Z literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_simple_table_668/data/_test_tb_status_c_17.tokudb b/mysql-test/std_data/tokudb_drop_simple_table_668/data/_test_tb_status_c_17.tokudb new file mode 100755 index 0000000000000000000000000000000000000000..01bf2459cb6725cdbd192ad30795d31337f93334 GIT binary patch literal 32768 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 literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_simple_table_668/data/test/tb.frm b/mysql-test/std_data/tokudb_drop_simple_table_668/data/test/tb.frm new file mode 100644 index 0000000000000000000000000000000000000000..8e65f1a36df371b14722d6a5aecbb9db5c3ebf81 GIT binary patch literal 8578 zcmeI&p$@_@5C-7C*Rik+fgl*nESMosI0yzovMd-Jn?<1T3-88@>_He;7zD8dHk#xW4piySCG0SZun0u-PC z1t>rP3Q&Lo6lkY_2r$s2dC(33Org_>PF8h73SSe2hbl?8yH$Fq@~WK|;i)JF|9Ki86GwW#Vx~=YFBo@okA%t};FONku}&s@2Y&PWz4`N)`P|;TH}2K( zsZratl~M->i5t?pHOkj@238ImIs(t)Zh2M7C?oFTso zbI^|-oczbV=6T*J2`{`a_W17guqGpb00IagfB*srAb7z=Or2L>FWB#=NtzVwk zzi@E8LF#=H`9i`^r8(KD^D<@sanX71*K7zNfB*srAb)<9s@}dQ{R)XJB!|y)+O&009ILKmY**5I_I{1Q0-A*9Eql|1Zds ztw_8bY#;X50i-4Jg_iV)QJw!+W}g;|H0rNaR89=v@w|oH((Js{4`lT~{_LBzs-&yw zx#~Lq{fU-DTh1*`x;fX*PS}^O^jK!Za&1dfHD#$zTF1KDs=p&RN;SMZ+*&{B+V0e3 zx&B_n>dM5m){^}y@lH$V7vfHKym%w)sOU^4CQnx~_2x#$x@|dD@l(V1l^0)(`2DD6 z=8mTZa_^J2@iRHlFa%SWd+%QPrn6C(f87x++-{Mb|b9 z4-Km$6Mym}HS_t}*GKX$YzQEL00IagfB*srAb19UIN5&!@I literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_simple_table_668/data/tokudb.environment b/mysql-test/std_data/tokudb_drop_simple_table_668/data/tokudb.environment new file mode 100755 index 0000000000000000000000000000000000000000..02a0313b848fbda87489d59a5446589b38cc04aa GIT binary patch literal 16384 zcmeI&ze~eF6bJBkNsN_7Dh}T;!@9hxJQ0 zxR}%|_<#TeAOHafKmY;|fB*y_009U< I;Lim<0o68MNdN!< literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/tokudb_drop_simple_table_668/data/tokudb.rollback b/mysql-test/std_data/tokudb_drop_simple_table_668/data/tokudb.rollback new file mode 100755 index 0000000000000000000000000000000000000000..4bedc6b3c55bf376ecae54d0731f9e295cee98a6 GIT binary patch literal 32768 zcmeI&y-rj?6ae5^kQF=E0xRQE5L;Rk0vo6-3{qIoXqEtt8k@Bz1n^xpS}6Ib7y+rzx>$l_PQyhmnmKJBOcE_ZO%NIo@zup z4XcQ=xsy7>IxUv4T|%0!Vr-E57p3#=d}|}O>R5iAD&c{3V=x%3L>biU_J1F}uG=C3 z0t5&UAV7cs0RjXF5Fl`;K<|$Hzs}f~hC6l2epTp|-mUrnVf7uLOs#jT7Tz@@|9{=-?&h=m`uskh`L9NK6=iv2@zaZl?I>^G zx7u+JU@w}Njg$}MH|GxaThV!M2oNAZfB*pk1PBly z@CXEE;vI4}Uq64NapSc{?)&FCW8>{I`*XF===hsIryp+Yr9*%K0RjXF5FkK+009C7 z2>cg;X8dcN`%ld8JLR?VegBE$?J_DcYo_ZKz#IvSk?|3Db`q0tg_000IagfB*srAbiLgH$(_e>;M1& literal 0 HcmV?d00001 diff --git a/mysql-test/suite/tokudb.bugs/r/tokudb_drop_simple_table_668.result b/mysql-test/suite/tokudb.bugs/r/tokudb_drop_simple_table_668.result new file mode 100644 index 00000000000..2b2d32b8577 --- /dev/null +++ b/mysql-test/suite/tokudb.bugs/r/tokudb_drop_simple_table_668.result @@ -0,0 +1,33 @@ +create table tc (id int, x int, primary key(id), key(x)); +select * from information_schema.tokudb_file_map; +dictionary_name internal_file_name +./test/ta-main ./_test_ta_main_8_17.tokudb +./test/ta-status ./_test_ta_status_7_17.tokudb +./test/tb-key-b ./_test_tb_key_b_e_17.tokudb +./test/tb-main ./_test_tb_main_d_17.tokudb +./test/tb-status ./_test_tb_status_c_17.tokudb +./test/tc-key-x ./_test_tc_key_x_12_3_18.tokudb +./test/tc-main ./_test_tc_main_12_2_18.tokudb +./test/tc-status ./_test_tc_status_12_1_18.tokudb +tokudb_meta ./tokudb_meta_3_17.tokudb +drop table ta; +select * from information_schema.tokudb_file_map; +dictionary_name internal_file_name +./test/tb-key-b ./_test_tb_key_b_e_17.tokudb +./test/tb-main ./_test_tb_main_d_17.tokudb +./test/tb-status ./_test_tb_status_c_17.tokudb +./test/tc-key-x ./_test_tc_key_x_12_3_18.tokudb +./test/tc-main ./_test_tc_main_12_2_18.tokudb +./test/tc-status ./_test_tc_status_12_1_18.tokudb +tokudb_meta ./tokudb_meta_3_17.tokudb +drop table tb; +select * from information_schema.tokudb_file_map; +dictionary_name internal_file_name +./test/tc-key-x ./_test_tc_key_x_12_3_18.tokudb +./test/tc-main ./_test_tc_main_12_2_18.tokudb +./test/tc-status ./_test_tc_status_12_1_18.tokudb +tokudb_meta ./tokudb_meta_3_17.tokudb +drop table tc; +select * from information_schema.tokudb_file_map; +dictionary_name internal_file_name +tokudb_meta ./tokudb_meta_3_17.tokudb diff --git a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test b/mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test new file mode 100644 index 00000000000..7eaa1a0a4dd --- /dev/null +++ b/mysql-test/suite/tokudb.bugs/t/tokudb_drop_part_table_668.test @@ -0,0 +1,67 @@ +# verify that we can drop partitioned tokudb tables created in tokudb 6.6.8 + +source include/have_tokudb.inc; + +# capture the datadir +let $MYSQLD_DATADIR= `SELECT @@datadir`; + +# shutdown mysqld (code stolen from mysql_plugin.test) +let $expect_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; +# MTR will remove this file later, but this might be too late. +--error 0,1 +--remove_file $expect_file +--write_file $expect_file +wait +EOF +--shutdown_server 10 +--source include/wait_until_disconnected.inc + +# remove all tokudb file in the datadir +system mkdir $MYSQLD_DATADIR/save; +system mv $MYSQLD_DATADIR/*toku* $MYSQLD_DATADIR/save; + +# install 6.6.8 tokudb test files +system cp -r std_data/tokudb_drop_part_table_668/data/* $MYSQLD_DATADIR; + +# restart mysqld +--append_file $expect_file +restart +EOF +--enable_reconnect +--source include/wait_until_connected_again.inc + +create table tc (a int, b int, c int, primary key(a), key(b)) partition by hash(a) partitions 2; + +# check that the tokudb meta data gets dropped when the table is dropped +select * from information_schema.tokudb_file_map; +drop table ta; +select * from information_schema.tokudb_file_map; +drop table tc; +select * from information_schema.tokudb_file_map; + +# check that the test dir is empty +list_files $MYSQLD_DATADIR/test *.frm; + +# shutdown mysqld (code stolen from mysql_plugin.test) +let $expect_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; +# MTR will remove this file later, but this might be too late. +--error 0,1 +--remove_file $expect_file +--write_file $expect_file +wait +EOF +--shutdown_server 10 +--source include/wait_until_disconnected.inc + +# restore saved datadir +system rm -rf $MYSQLD_DATADIR/*toku*; +system mv $MYSQLD_DATADIR/save/* $MYSQLD_DATADIR; +system rmdir $MYSQLD_DATADIR/save; + +# restart mysqld +--append_file $expect_file +restart +EOF +--enable_reconnect +--source include/wait_until_connected_again.inc + diff --git a/mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test b/mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test new file mode 100644 index 00000000000..cee727cc844 --- /dev/null +++ b/mysql-test/suite/tokudb.bugs/t/tokudb_drop_simple_table_668.test @@ -0,0 +1,69 @@ +# verify that we can drop simple tokudb tables created in tokudb 6.6.8 + +source include/have_tokudb.inc; + +# capture the datadir +let $MYSQLD_DATADIR= `SELECT @@datadir`; + +# shutdown mysqld (code stolen from mysql_plugin.test) +let $expect_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; +# MTR will remove this file later, but this might be too late. +--error 0,1 +--remove_file $expect_file +--write_file $expect_file +wait +EOF +--shutdown_server 10 +--source include/wait_until_disconnected.inc + +# remove all tokudb file in the datadir +system mkdir $MYSQLD_DATADIR/save; +system mv $MYSQLD_DATADIR/*toku* $MYSQLD_DATADIR/save; + +# install 6.6.8 tokudb test files +system cp -r std_data/tokudb_drop_simple_table_668/data/* $MYSQLD_DATADIR; + +# restart mysqld +--append_file $expect_file +restart +EOF +--enable_reconnect +--source include/wait_until_connected_again.inc + +create table tc (id int, x int, primary key(id), key(x)); + +# check that the tokudb meta data gets dropped when the table is dropped +select * from information_schema.tokudb_file_map; +drop table ta; +select * from information_schema.tokudb_file_map; +drop table tb; +select * from information_schema.tokudb_file_map; +drop table tc; +select * from information_schema.tokudb_file_map; + +# check that the test dir is empty +list_files $MYSQLD_DATADIR/test *.frm; + +# shutdown mysqld (code stolen from mysql_plugin.test) +let $expect_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; +# MTR will remove this file later, but this might be too late. +--error 0,1 +--remove_file $expect_file +--write_file $expect_file +wait +EOF +--shutdown_server 10 +--source include/wait_until_disconnected.inc + +# restore saved datadir +system rm -rf $MYSQLD_DATADIR/*toku*; +system mv $MYSQLD_DATADIR/save/* $MYSQLD_DATADIR; +system rmdir $MYSQLD_DATADIR/save; + +# restart mysqld +--append_file $expect_file +restart +EOF +--enable_reconnect +--source include/wait_until_connected_again.inc +