database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge from mysql-trunk.

Browse Source 
Conflicts:
  - client/mysqltest.cc
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/t/disabled.def
  - sql/mysqld.cc
  - sql/opt_range.cc
  - sql/sp.cc
  - sql/sql_acl.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
This commit is contained in:
Alexander Nozdrin
2009-12-11 12:39:38 +03:00
parent 713ed2d243 2757eab544
commit 69cfd5c8ec
1063 changed files with 62539 additions and 35389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/std_data/Index.xml
View File

@ -1,23 +1,29 @@
<charsets>
<charset name="utf8">
<collation name="utf8_test_ci" id="240">
<collation name="utf8_test_ci" id="353">
<rules>
<reset>a</reset>
<s>b</s>
</rules>
</collation>
<collation name="utf8_maxuserid_ci" id="2047">
<rules>
<reset>a</reset>
<s>b</s>
</rules>
</collation>
</charset>
<charset name="ucs2">
<collation name="ucs2_test_ci" id="241">
<collation name="ucs2_test_ci" id="358">
<rules>
<reset>a</reset>
<s>b</s>
</rules>
</collation>
<collation name="ucs2_vn_ci" id="242">
<collation name="ucs2_vn_ci" id="359">
<!-- Vietnamese experimental collation -->
<rules>
<reset>A</reset>

64
mysql-test/std_data/loadxml.dat Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0"?>
<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<database name="test">
<table_structure name="t1">
<field Field="a" Type="int(11)" Null="YES" Key="" Extra="" />
<field Field="b" Type="varchar(128)" Null="YES" Key="" Extra="" />
<options Name="t1" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="3" Avg_row_length="20" Data_length="60" Max_data_length="281474976710655" Index_length="1024" Data_free="0" Create_time="2007-02-09 09:08:36" Update_time="2007-02-09 09:08:54" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_data name="t1">
<row>
<field name="a">1</field>
<field name="b">b1</field>
</row>
<row>
<field name="a">2</field>
<field name="b">b2</field>
</row>
<row>
<field name="a">3</field>
<field name="b">b3</field>
</row>
<row>
<field name="a">11</field>
<field name="b">b11</field>
</row>
<!-- Check field values as tags -->
<row>
<a>111</a>
<b>b111</b>
</row>
<row>
<a>112</a>
<b>b112 &amp; &lt; &gt; &quot; &apos; &unknown; -- check entities</b>
</row>
<!-- Check field values in attributes -->
<row a=212 b="b212"></row>
<!-- Bug#29752 Linefeeds break LOAD XML INFILE -->
<!-- Check varios combinations of TAB and NL -->
<row
a=213 b="b213">
</row>
<row
a=214
b="b214">
</row>
<row a=215 b="b215"></row>
<row a=216 b="&bb
b;"></row>
<!-- End of bug#29752 -->
</table_data>
</database>
</mysqldump>

19
mysql-test/std_data/loadxml2.dat Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0"?>
<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<database name="test_of_xml_import">
<table_structure name="t1">
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="" />
<field Field="text" Type="text" Null="YES" Key="" Extra="" />
<key Table="t1" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="1" Null="" Index_type="BTREE" Comment="" Index_Comment="" />
<options Name="t1" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="1" Avg_row_length="32" Data_length="32" Max_data_length="281474976710655" Index_length="2048" Data_free="0" Create_time="2009-06-18 10:02:37" Update_time="2009-06-18 10:02:43" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_data name="t1">
<row>
<field name="id">1</field>
<field name="text">line1
line2
line3</field>
</row>
</table_data>
</database>
</mysqldump>