Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

24 files changed, 91 insertions, 0 deletions

diff --git a/mysql-test/std_data/loaddata/mdev-11079.txt b/mysql-test/std_data/loaddata/mdev-11079.txt
new file mode 100644
index 00000000..a792f984
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev-11079.txt
@@ -0,0 +1 @@
+"%ª«¬"
diff --git a/mysql-test/std_data/loaddata/mdev-11343.txt b/mysql-test/std_data/loaddata/mdev-11343.txt
new file mode 100644
index 00000000..dded1215
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev-11343.txt
@@ -0,0 +1,12 @@
+\ä
+\äx
+x\ä
+x\äx
+\ê™ 
+\ê™ x
+x\ê™ 
+x\ê™ x
+\😎
+\😎x
+x\😎
+x\😎x
diff --git a/mysql-test/std_data/loaddata/mdev-11631.txt b/mysql-test/std_data/loaddata/mdev-11631.txt
new file mode 100644
index 00000000..87b824b7
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev-11631.txt
@@ -0,0 +1 @@
+\ä
diff --git a/mysql-test/std_data/loaddata/mdev-15497.txt b/mysql-test/std_data/loaddata/mdev-15497.txt
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev-15497.txt
@@ -0,0 +1 @@
+1
diff --git a/mysql-test/std_data/loaddata/mdev12696.xml b/mysql-test/std_data/loaddata/mdev12696.xml
new file mode 100644
index 00000000..a2789acb
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev12696.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<resultset statement="SELECT 'test' AS c1, NULL AS c2
+" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <row>
+	<field name="c1">test</field>
+	<field name="c2" xsi:nil="true" />
+  </row>
+</resultset>
diff --git a/mysql-test/std_data/loaddata/mdev14628a.xml b/mysql-test/std_data/loaddata/mdev14628a.xml
new file mode 100644
index 00000000..34ee7336
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev14628a.xml
@@ -0,0 +1,4 @@
+<list>
+  <row a="1" b="bbb1"/>
+  <row b="bbb2"/>
+</list>
diff --git a/mysql-test/std_data/loaddata/mdev14628b.xml b/mysql-test/std_data/loaddata/mdev14628b.xml
new file mode 100644
index 00000000..2ea02d2a
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev14628b.xml
@@ -0,0 +1,3 @@
+<list>
+  <row id="1"/>
+</list>
diff --git a/mysql-test/std_data/loaddata/mdev8711.txt b/mysql-test/std_data/loaddata/mdev8711.txt
new file mode 100644
index 00000000..49296a71
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev8711.txt
@@ -0,0 +1 @@
+°@a°A@°B@
\ No newline at end of file
diff --git a/mysql-test/std_data/loaddata/mdev9823.ujis.txt b/mysql-test/std_data/loaddata/mdev9823.ujis.txt
new file mode 100644
index 00000000..5468c999
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev9823.ujis.txt
@@ -0,0 +1,11 @@
+# This file has incomplete UJIS sequences {8F}, {8FA1},
+# has a valid UJIS sequence {8FA1A1},
+# and has no NL at the end:
+# {8F} \n xxx1 {8FA1} \n xxx2 {8FA1A1} \n xxx3 \n {8FA1} EOF
+�
+xxx1
+�¡
+xxx2
+�¡¡
+xxx3
+�¡
\ No newline at end of file
diff --git a/mysql-test/std_data/loaddata/mdev9823.utf8mb4.txt b/mysql-test/std_data/loaddata/mdev9823.utf8mb4.txt
new file mode 100644
index 00000000..87739567
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev9823.utf8mb4.txt
@@ -0,0 +1,12 @@
+# This file has incomplete utf8mb4 sequences {D0}, {E180}, {F09F98},
+# has a valid utf8mb4 sequence {F09F988E}
+# and has no NL at the end:
+# {D0} \n xxx1 {E180} xxx2 \n {F09F98} \n xxx3 {F09F988E} {F09F98} EOF
+Ð
+xxx1
+á€
+xxx2
+ðŸ˜
+xxx3
+😎
+ðŸ˜
\ No newline at end of file
diff --git a/mysql-test/std_data/loaddata/mdev9824.txt b/mysql-test/std_data/loaddata/mdev9824.txt
new file mode 100644
index 00000000..7050e081
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev9824.txt
@@ -0,0 +1 @@
+aёёbёёcёё
\ No newline at end of file
diff --git a/mysql-test/std_data/loaddata/mdev9842.txt b/mysql-test/std_data/loaddata/mdev9842.txt
new file mode 100644
index 00000000..1aed9a9a
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev9842.txt
@@ -0,0 +1 @@
+xƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\ƒ\
diff --git a/mysql-test/std_data/loaddata/mdev9874.xml b/mysql-test/std_data/loaddata/mdev9874.xml
new file mode 100644
index 00000000..513a0dff
--- /dev/null
+++ b/mysql-test/std_data/loaddata/mdev9874.xml
@@ -0,0 +1 @@
+<table><row><a>aÐ</a></row></table>
\ No newline at end of file
diff --git a/mysql-test/std_data/loaddata/nl.txt b/mysql-test/std_data/loaddata/nl.txt
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/mysql-test/std_data/loaddata/nl.txt
@@ -0,0 +1 @@
+
diff --git a/mysql-test/std_data/loaddata1.dat b/mysql-test/std_data/loaddata1.dat
new file mode 100644
index 00000000..c9e8549b
--- /dev/null
+++ b/mysql-test/std_data/loaddata1.dat
@@ -0,0 +1,3 @@
+,\N,NULL,,
+00,0,000000,,
+2003-03-03, 20030303,030303,\N
diff --git a/mysql-test/std_data/loaddata2.dat b/mysql-test/std_data/loaddata2.dat
new file mode 100644
index 00000000..6e9d6745
--- /dev/null
+++ b/mysql-test/std_data/loaddata2.dat
@@ -0,0 +1,5 @@
+Field A,'Field B'
+Field 1,'Field 2' 
+Field 3,'Field 4'
+'Field 5' ,'Field 6'
+Field 6, 'Field 7'
diff --git a/mysql-test/std_data/loaddata3.dat b/mysql-test/std_data/loaddata3.dat
new file mode 100644
index 00000000..4c82f139
--- /dev/null
+++ b/mysql-test/std_data/loaddata3.dat
@@ -0,0 +1,6 @@
+number     row data
+1          row 1     
+2          row 2     
+error      12345678901234567890123456789012345678901234567890
+3          row 3     
+wrong end  12345678901234567890123456789012345678901234567890
diff --git a/mysql-test/std_data/loaddata4.dat b/mysql-test/std_data/loaddata4.dat
new file mode 100644
index 00000000..9c0d7444
--- /dev/null
+++ b/mysql-test/std_data/loaddata4.dat
@@ -0,0 +1 @@
+test       row data  1          row 1     2          row 2     3          row 3     
diff --git a/mysql-test/std_data/loaddata5.dat b/mysql-test/std_data/loaddata5.dat
new file mode 100644
index 00000000..6e1881bd
--- /dev/null
+++ b/mysql-test/std_data/loaddata5.dat
@@ -0,0 +1,3 @@
+1          2          
+3          4          
+5          6          
diff --git a/mysql-test/std_data/loaddata6.dat b/mysql-test/std_data/loaddata6.dat
new file mode 100644
index 00000000..29e181eb
--- /dev/null
+++ b/mysql-test/std_data/loaddata6.dat
@@ -0,0 +1 @@
+ÿ
diff --git a/mysql-test/std_data/loaddata7.dat b/mysql-test/std_data/loaddata7.dat
new file mode 100644
index 00000000..e86d1621
--- /dev/null
+++ b/mysql-test/std_data/loaddata7.dat
@@ -0,0 +1,5 @@
+2,2

+3,3

+4,4

+5,5

+6,6
\ No newline at end of file
diff --git a/mysql-test/std_data/loaddata_dq.dat b/mysql-test/std_data/loaddata_dq.dat
new file mode 100644
index 00000000..5bdddfa9
--- /dev/null
+++ b/mysql-test/std_data/loaddata_dq.dat
@@ -0,0 +1,3 @@
+"field1","field2"
+"a""b","cd""ef"
+"a"b",c"d"e
diff --git a/mysql-test/std_data/loaddata_pair.dat b/mysql-test/std_data/loaddata_pair.dat
new file mode 100644
index 00000000..5a4f6b57
--- /dev/null
+++ b/mysql-test/std_data/loaddata_pair.dat
@@ -0,0 +1,2 @@
+XXX	12345
+XXY	12345
diff --git a/mysql-test/std_data/loaddata_utf8.dat b/mysql-test/std_data/loaddata_utf8.dat
new file mode 100644
index 00000000..fc7a2822
--- /dev/null
+++ b/mysql-test/std_data/loaddata_utf8.dat
@@ -0,0 +1,3 @@
+一二三
+四五六
+七八�