From eaa3da8e775721130de3a86c009b74b9bd94b4bf Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@askmonty.org>
Date: Mon, 13 Apr 2015 20:41:49 +1000
Subject: [PATCH] Add mysql-test/std_data/mysql_upgrade/* for MDEV-6916

---
 mysql-test/std_data/mysql_upgrade/event.MYD |   0
 mysql-test/std_data/mysql_upgrade/event.MYI | Bin 0 -> 2048 bytes
 mysql-test/std_data/mysql_upgrade/event.frm | Bin 0 -> 10223 bytes
 mysql-test/std_data/mysql_upgrade/v1.frm    |  15 +++++++++++++++
 mysql-test/std_data/mysql_upgrade/v2.frm    |  15 +++++++++++++++
 mysql-test/std_data/mysql_upgrade/v3.frm    |  15 +++++++++++++++
 mysql-test/std_data/mysql_upgrade/v4.frm    |  16 ++++++++++++++++
 7 files changed, 61 insertions(+)
 create mode 100644 mysql-test/std_data/mysql_upgrade/event.MYD
 create mode 100644 mysql-test/std_data/mysql_upgrade/event.MYI
 create mode 100644 mysql-test/std_data/mysql_upgrade/event.frm
 create mode 100644 mysql-test/std_data/mysql_upgrade/v1.frm
 create mode 100644 mysql-test/std_data/mysql_upgrade/v2.frm
 create mode 100644 mysql-test/std_data/mysql_upgrade/v3.frm
 create mode 100644 mysql-test/std_data/mysql_upgrade/v4.frm

diff --git a/mysql-test/std_data/mysql_upgrade/event.MYD b/mysql-test/std_data/mysql_upgrade/event.MYD
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/mysql-test/std_data/mysql_upgrade/event.MYI b/mysql-test/std_data/mysql_upgrade/event.MYI
new file mode 100644
index 0000000000000000000000000000000000000000..d5c16c3892ffacd8ab4f90a09232baf03e6b0da1
GIT binary patch
literal 2048
zcmeH@u?@m75Jmsl0a74AfdnN?LCX#>00nzMg(w+?5fBqlQXx^X1>xV>fe;0W9-m~t
z^WD$I{*OmT;9Uy`tZ;?{1QYIz!uE!(h!I+OgW_9Brqxb4r_NHd*xs%&7iHyKO6oKn
z@avtj3!n?5H7`L9xQ1N5-R39{mqYeEe}ohCSl=R-oy@J}aU{(*nOH@va<aVaScwL!
z78$w<!Cm1w%#a21CDSTJZ&0G|BKiSi>%}J<eE1;#;dPp+P_R@In*d?XOE@A$av(X7
K97qoQn*&dbSvraU

literal 0
HcmV?d00001

diff --git a/mysql-test/std_data/mysql_upgrade/event.frm b/mysql-test/std_data/mysql_upgrade/event.frm
new file mode 100644
index 0000000000000000000000000000000000000000..fd4ff199b56a5dd40175f3212bf5f4a6664a66ba
GIT binary patch
literal 10223
zcmeHNO>g5w7=G;}&DS<<x9!q}!!F$5va4ORLWqw#@iZ}Y?9^iy!eyGqE?CM3ByPoW
zK!qahfddC_a0Ct<_z#s3NACL%_P~K7NJt&tahy06NR$iPN@FR?`#v-8*E7!{8Tm{p
z7Bc|L3cy`}P<fn%>7%{`MSz@epPynO?(6*waAykKLF@L^k>8R5$$(@)G9Vd{3`hnf
z1CjyBfMh^2AQ_MhTuKHM6`%wv918=KW4sGc;1ty3pG3Q-z*~;d)SNcIl-*yUrZ~SX
zpQp;eyjY%UBmZCV`H}zCR`6~QFY~VWBW9p&>XPOaALJ6ZFE~!01!z7rsMeeyx6%b^
zNd_bXk^#wpWI!??8ITNIJ_dfv!}7(uS|CTkAR1ph;L`6@;RZZXUMmAU&OU)Gybiyr
zCu$4PQr!Cs%G#>B_Toi<jAMq3zmG3X<OZF701J@YANmg=4+TFs2nWFk3Q!I{3c80;
zz&a7WV6hYqqF{8?=`s8q23R&l4#J@4Lm3L)QP7D3AFe^MKlDSyeOQD_uQQHVlFf$-
z<i}BGgvYZ4xnSUr@ni)O9gblID#HQm4*MVUf+!pg;5rn?ANCk#3t$xs4EudNSy+Se
za1_254m#0r1nW?W!hXO$9u5LzWWD=-XVmFpyKEdptlJAkNC4T)e`9F9JM8s3q7Ce5
zFbKMFM>$yZ_Yp{zkh_xLjvYn^uV4xD6ym!nJe4zwuchSPI)(U-N&xtN%0jMCfD;97
z>T3Xhz6p>o)StkY3SMU=A%*hlDjcb>cZ|Tb0zh%8T!v3ncuoKr1WHQ}9>8ZR6h2)B
z<#$Y4E?~%s3UAzcMkK_rA_9*DfFS}{tRV2kT+&J&fv@I(r5pm^%mK@Jtnw{ZQI<g!
zRaPn+8}Qu($OzziaqH{c_bP0tE0FyIfz?9&6n;?CS=P#>5`-Ceb~9;xy|lRrePl>H
zXV}<{^;h@c#|&QS2>=<(3Scpt0=dQN9`xscg%VQuOBQZ^o>0jBeJ*s&#X;~y!90~O
zKd;@?jfKk-)$*xi`8mDviCDQ%s<2U}{G3MlRG>UjCr_oxXS(G7Bub3<yTWjqR9^8&
zv9>tyHqjiu<7tjd9Nx4ox50I-%^S9du3>pD;cpYN%_*tbmX1)(u@hT_vRMd=Lok*l
zVZuyyilr$W+p}z<z;xFnHqD<zrNAUHCQ6}6qH_>%Vrf;A=v>FY=CMIdZI@6(Cu{}*
z*B!fsSG<H0XO|!o4$(}eQMP5;n#)^8i%{X>*fsPuiyCalvt2^DQMYUd+iqz!!Y$in
z9>r?5WwzOtXPT_;*j|fO+qlL&jH_EjXVj~@j#hIG+Y-2LILxqE4XYx>Et|S^Y-Pvf
zHf}NrZ&Kmt)qA|Dy`xt}$Tn#+yCo7(;kshBd0@*Rral9jZA@_g-hCb$FW-$P5OJF4
z+H6-dJq)(kyTq{tTGeXXNE2-^LTeh%&Z+AdHJ4%27M&EEVHyq@mya6}Da0(gm;_VB
ze(V?))-m*Wg>vFJw!^mYqZ_*h#W|3pNds6!H^gL`Icsr3jo{Yd4Wr&*f@wUj8qtXr
j6VHfMH!M5|uS#9R^<r*Yn$BtsR3=UtpN5IMP}T4k%5k`&

literal 0
HcmV?d00001

diff --git a/mysql-test/std_data/mysql_upgrade/v1.frm b/mysql-test/std_data/mysql_upgrade/v1.frm
new file mode 100644
index 00000000000..be197fd76a8
--- /dev/null
+++ b/mysql-test/std_data/mysql_upgrade/v1.frm
@@ -0,0 +1,15 @@
+TYPE=VIEW
+query=select `test`.`t1`.`a` AS `a` from `test`.`t1`
+md5=5e6eaf216e7b016fcedfd4e1113517af
+updatable=0
+algorithm=1
+definer_user=root
+definer_host=localhost
+suid=2
+with_check_option=0
+timestamp=2014-12-11 15:26:20
+create-version=1
+source=select a from t1
+client_cs_name=utf8
+connection_cl_name=utf8_general_ci
+view_body_utf8=select `test`.`t1`.`a` AS `a` from `test`.`t1`
diff --git a/mysql-test/std_data/mysql_upgrade/v2.frm b/mysql-test/std_data/mysql_upgrade/v2.frm
new file mode 100644
index 00000000000..42cc06d9fba
--- /dev/null
+++ b/mysql-test/std_data/mysql_upgrade/v2.frm
@@ -0,0 +1,15 @@
+TYPE=VIEW
+query=select `test`.`t1`.`a` AS `a` from `test`.`t1`
+md5=5e6eaf216e7b016fcedfd4e1113517af
+updatable=1
+algorithm=2
+definer_user=root
+definer_host=localhost
+suid=2
+with_check_option=0
+timestamp=2014-12-11 15:26:29
+create-version=1
+source=select a from t1
+client_cs_name=utf8
+connection_cl_name=utf8_general_ci
+view_body_utf8=select `test`.`t1`.`a` AS `a` from `test`.`t1`
diff --git a/mysql-test/std_data/mysql_upgrade/v3.frm b/mysql-test/std_data/mysql_upgrade/v3.frm
new file mode 100644
index 00000000000..cca46ae9170
--- /dev/null
+++ b/mysql-test/std_data/mysql_upgrade/v3.frm
@@ -0,0 +1,15 @@
+TYPE=VIEW
+query=select `test`.`t1`.`a` AS `a` from `test`.`t1`
+md5=5e6eaf216e7b016fcedfd4e1113517af
+updatable=0
+algorithm=0
+definer_user=root
+definer_host=localhost
+suid=2
+with_check_option=0
+timestamp=2014-12-11 15:26:20
+create-version=1
+source=select a from t1
+client_cs_name=utf8
+connection_cl_name=utf8_general_ci
+view_body_utf8=select `test`.`t1`.`a` AS `a` from `test`.`t1`
diff --git a/mysql-test/std_data/mysql_upgrade/v4.frm b/mysql-test/std_data/mysql_upgrade/v4.frm
new file mode 100644
index 00000000000..9d0cc48447d
--- /dev/null
+++ b/mysql-test/std_data/mysql_upgrade/v4.frm
@@ -0,0 +1,16 @@
+TYPE=VIEW
+query=select `test`.`t1`.`a` AS `a` from `test`.`t1`
+md5=5e6eaf216e7b016fcedfd4e1113517a0
+updatable=1
+algorithm=0
+definer_user=root
+definer_host=localhost
+suid=2
+with_check_option=0
+timestamp=2015-02-08 19:21:14
+create-version=1
+source=select a from t1
+client_cs_name=latin1
+connection_cl_name=latin1_swedish_ci
+view_body_utf8=select `test`.`t1`.`a` AS `a` from `test`.`t1`
+mariadb-version=50542