From a7dbf78f4e7b1725f16daa91b01de520f55d2b00 Mon Sep 17 00:00:00 2001 From: Nikita Pettik <korablev@tarantool.org> Date: Thu, 15 Nov 2018 17:54:14 +0300 Subject: [PATCH] Disable triggers for _collation during bootstrap After patch that introduced "none" collation (a953051), box.internal.bootstrap() started to fail due to inability to drop mentioned collation. Lets turn off system triggers for _collation space in order to process its complete purification during bootstrap. --- src/box/bootstrap.snap | Bin 1911 -> 1911 bytes src/box/lua/upgrade.lua | 1 + 2 files changed, 1 insertion(+) diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap index 9287fa223ea6b5b475ffd9ac7b492b031c338d60..b7789d6df20a9cc337449671abfdd186bc2c3501 100644 GIT binary patch delta 1174 zcmV;H1Zn&C4)+d_9e*)2VqrEoW;rtoNp5p=VQyn(Iv`>>FlA$7WH~KiHe_KfG&W^8 zEn#J1Gc9H`Ibkw5VP#}uWH|~}Lu_wjYdRo%eF_TIx(m9^2K@leMZHH+r2qf`001bp zFZ}>er8fY&OmGlM&{$0Y0Hq#AsfW$940<7a1XZAnLAJ<mL4RAFns~sFHK?^EG9@)B zY1bqX@<pCj5{iuy1pMgkuN{lG+T?U*mo8L2$VQ%~lv3{i=K%TuMQARacjqP1%*Yh# zu!oTt_OFg#8+9Ro_r~OZq1Z{yKbrU2mAMvgAIf^o%lA7R^4r6(t`QkgFW*oEx9c`E z{{vq|I{dMczJLGs-t~U(Z@qUvna;5rg;L6dgo7C%+gN8-X$9CiN7=@(yhGcoyY%nQ zZ$r7eN;N=^6fS7=J+RAKv{3-I&e6z{9yWSpxIj_T*PyOVB<{u9I>$+?1~cCuvmLQ@ zj!l%w%U1})N^0vIKL^#qsSsGD<E2hGI60~l&e_p9fq&R({i(J3XW`%+3|aPfE`FVD z#<|crt+)_fNufjw-h!p43V=F^0!jG89WRq^@16(?T>1yQ#@l6!<sDv<svaEe=VI!` z);Yeqh>!Mj@sbqf;7F&%R_vD4rh%<<6#Mfdofcb{q%{nXV%J7FmyJU*(~yMT)A^Q^ zW<iqJRez#03Oe?#6G|b0t#j1)KM-Vno$Oy7?#RAz=cEwU8AjXh`mVDr{LX7h^ou~x zZxWS35cE05W!x6KHX3uFW7q~;r3-&8vTG6SuJ?UzE$QsiUn03Bg)w03977DF@g9OT z+<{*i%KCmC1d>dUG?+X7KCrt=^re8UbENVg3x9u~s4ve;FMc>i$~2~pvJX|oGgT+- z%t&P-RU$<qH3B69wL+<ELfGsS*?_3gsmZZ*jzu*%Tx!OlXg<tnZe~t19%eecIDS#! zAY&s_BeNk!LrjJk47I{sptGVW6vhG!N9hZVt#f>-FlR+nUIfZoEQkJguT2-qgv8Oz z*nc|5r4Q_suosFNOnP-4!$_W&^luy{d0&2YNxIH>cdo(i7HM54)T3bQ9ATK3p00hG z2K1VSq!UD@^O}&CX&<Z8QXO}GKOlaUD3A%>cf4P}>+;-W$><5iA;H!;lC$r))8g(o ziT=dcI!7ayEAM`9)Cb1aIf}D;qdXB}d4Gp12)54A^<R$V9R@3p<vmv6;FV76l*4*_ zQvHt3341&EwDP*{Q7aaPEOf^4cojOz;<32?3|ZZj5St(zkeMGe#)qwQtS^*_tUag( zbMLg+x>b6_sdzLsHCdrMY@H*_e7--HwRqEE>l^{pNsl;Hj{Tv?Nm>C%m%s4$5`VQf z{sVWd%O6V&OInXOlntF>9wsTRVe1@AxLU7J#=o8yEV>Rge0-2hMn{D&f<E?&NlD=s zKZW?!B@ON8Vy*KRT_l}H9EygmbL`0hgGRxY&NutHcyl8JvY=3U#MR88o(x;(=*0*y oGYSG@2IR$!{@`%&<3oK~_^_ZnD++j2tWvB{ta@f;vz`Rm0?CFo6#xJL delta 1174 zcmV;H1Zn&C4)+d_9e-moFk?73F=k{6Np5p=VQyn(Iv{3cFkv_}F)}S<G%#c>G%;i~ zEjckTG%YYSVL4@FWn^S!W-|&_Lu_wjYdRo%eF_TIx(m9^2K@le>`ZmDr2qf`001bp zFZ}>er8fY&OmGlM;25U>5QZ_v7-I;+)F7k63_`;uA|!6Z_J1ITG$BNyD6kumDalGn zyC#W{FY>gKQC&x97o+F9mER&|H@()h$i1kls_Ph2N-6LF=K%QtM`SFWcjvUA7?SzZ zUGFNf>subbHR?hD?~Tg`#j%%~gR<{6D|0>CUWE18m+yO6<hFNVJqsG5U%uiPZk7#b zJ{Y!+co<aOzJEXX-~E2?U;TGMn9i>&g;I*7go7CX+gN86%?hw}lCX_kd5g7HXX)Ra z+kmonjcR}$D`3dzf1#K4Sfc=Jog@+_KXB;KfT4m$Ux#`&i?|nS>m(<wI?R0ktCqyp zNhVRGFW(>RqETBXdBUbscfuXcmr|9y5ICrkh}7v+N`L(aq9g)mM5;55P+`!rzw;6F zYBA1*&WXh(XtYv9!-OqabglrXGblF<Vvo~qw|j3y6(0SEUE|HFz48`sNl_1o_Vdy7 zV(TPZeZ)lj`FKm(IY{E^arL@1YSX~hNsj$_5>Jn-ThbZ^MXy_<oXf^ynPo*k|LJ^b zlxD$_*MBvlGYUHX?h{HOfvuC&_`xt#fgbEz9`?$<ap&a^*4ZW7&-$)&P5jPhOZ1OD z&+m=OAn^J8;xJx&-5QNK(6MWWD;f)ftFr4c^zH|KULEPo(oa)zX%xnQt&<e7OUAnx z&afAPG!fSKYoD-eQl!J&F$jj<HKH#CY@KA42Y*!<1V?>&KKc>FuM(!QjD&p^l`~N( zY-|XH!gRu9!c?Lo(WN?+%?KM2LN+)xr<xG9PEx1_1ZRqI9nFUr&CN_{#=}g97RN0L z9As={YGgLVXo$%WgP~TK3p6G~g~C{X;V6Bfv2~I!6=qDR%8xx+k2IkF-DlH<A{B8o zGk>;D@(2t)Bm9Y@4sR{5V^_)Zk^YUv+Xv>Bx1{Tgcjr3v?vd4fLO%+&PSS-r?b9<* z%X(hRicUjhI-mV~Sq7@Q%+zt`7wqBJhzgnTeaHLtvo6n0j)tI69TIGvWEuO8Jw5Jz zZ<Hs-)=3VrSb6trqdPFRPI8Q08_kLE%70r-L9lg_tOxTeZ!sZO|9$^`3gdL8Q)fz* za6Z$i^mQk%1j2Me;qF%$w9pur^HuPuD#zl=QzUgwL~Mp|LS}-{7$CMzvc6EHvi_ht z%-z%D%2p{6hw_n>l!S%$uyv9!^ZEW))}xJwt&;>$Cne%gJNAnsFKGoGUIxYAM}O4j zcre^EFN3O4q|r*mbvSf(eYm9bhOLu4!CJLM7zcG?xbQmM0P;RC8od)^`24H&nqtB& zUJ`N3y8-Rz<E--^StXrBTxY}9N$Tv7A*10+=bQa}yt(-aRZ%D<;%aKpkA|(2{AL7* o4GobI6B5Hld33<w*`Yfxc3jY$7795mQY%s_QaUkOvz`Rm0-Uxs<NyEw diff --git a/src/box/lua/upgrade.lua b/src/box/lua/upgrade.lua index 4b0fd03456..3d9acc9767 100644 --- a/src/box/lua/upgrade.lua +++ b/src/box/lua/upgrade.lua @@ -70,6 +70,7 @@ local function set_system_triggers(val) box.space._func:run_triggers(val) box.space._priv:run_triggers(val) box.space._trigger:run_triggers(val) + box.space._collation:run_triggers(val) end -------------------------------------------------------------------------------- -- GitLab