summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mysql.com>2009-12-15 13:48:29 +0400
committerAlexander Barkov <bar@mysql.com>2009-12-15 13:48:29 +0400
commit9c47ea838078a33ef7fad6d13697c9190c8035b6 (patch)
tree4bc7c01f93ccd29d4c9290757eda260689e49d9d /mysql-test/std_data
parentca049fbed8123502ba98b24e1a0234ff204c1f9f (diff)
downloadmariadb-git-9c47ea838078a33ef7fad6d13697c9190c8035b6.tar.gz
Bug#49134 5.1 server segfaults with 2byte collation file
Problem: add_collation did not check that cs->number is smaller than the number of elements in the array all_charsets[], so server could crash when loading an Index.xml file with a collation ID greater the number of elements (for example when downgrading from 5.5). Fix: adding a condition to check that cs->number is not out of valid range.
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r--mysql-test/std_data/Index.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/std_data/Index.xml b/mysql-test/std_data/Index.xml
index 3dc647d8195..b8f61d59203 100644
--- a/mysql-test/std_data/Index.xml
+++ b/mysql-test/std_data/Index.xml
@@ -8,6 +8,13 @@
</rules>
</collation>
+ <collation name="utf8_hugeid_ci" id="2047000000">
+ <rules>
+ <reset>a</reset>
+ <s>b</s>
+ </rules>
+ </collation>
+
</charset>
<charset name="ucs2">