From cc2c0b6df36577194da702cd4ed98dc14b377987 Mon Sep 17 00:00:00 2001
From: unknown <bar@bar.mysql.r18.ru>
Date: Tue, 1 Apr 2003 17:49:24 +0500
Subject: [PATCH] Standard charset names: pclatin1 -> cp850 pclatin2 -> cp852

BitKeeper/deleted/.del-pclatin1.xml~d42c4a35e61526fa:
  Delete: sql/share/charsets/pclatin1.xml
BitKeeper/deleted/.del-pclatin2.xml~419e68f6672a99a:
  Delete: sql/share/charsets/pclatin2.xml
---
 sql/share/charsets/Index.xml                   | 13 ++++++-------
 sql/share/charsets/{pclatin1.xml => cp850.xml} |  6 +++---
 sql/share/charsets/{pclatin2.xml => cp852.xml} |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)
 rename sql/share/charsets/{pclatin1.xml => cp850.xml} (97%)
 rename sql/share/charsets/{pclatin2.xml => cp852.xml} (98%)

diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index edb74fd2a9e..cfafcc339bd 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -63,14 +63,13 @@ To make maintaining easier please:
   </collation>
 </charset>
 
-<charset name="pclatin1">
+<charset name="cp850">
   <family>Western</family>
   <description>DOS West European</description>
   <alias>850</alias>
-  <alias>cp850</alias>
   <alias>cspc850multilingual</alias>
   <alias>ibm850</alias>
-  <collation name="pclatin1"	id="4"	flag="primary">
+  <collation name="cp850_general_ci"	id="4"	flag="primary">
     <order>Dutch</order>
     <order>English</order>
     <order>French</order>
@@ -80,7 +79,7 @@ To make maintaining easier please:
     <order>Pogtuguese</order>
     <order>Spanish</order>
   </collation>
-  <collation name="pclatin1_bin"	id="80"	order="Binary"	flag="binary"/>
+  <collation name="cp850_bin"	id="80"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="latin1">
@@ -479,13 +478,13 @@ To make maintaining easier please:
   </collation>
 </charset>
 
-<charset name="pclatin2">
+<charset name="cp852">
   <family>Central European</family>
   <description>DOS Central European</description>
   <alias>852</alias>
   <alias>cp852</alias>
   <alias>ibm852</alias>
-  <collation name="pclatin2"	id="40"	flag="primary">
+  <collation name="cp852_general_ci"	id="40"	flag="primary">
     <order>Hungarian</order>
     <order>Polish</order>
     <order>Romanian</order>
@@ -494,7 +493,7 @@ To make maintaining easier please:
     <order>Slovenian</order>
     <order>Sorbian</order>
   </collation>
-  <collation name="pclatin2_bin"	id="81"	order="Binary"	flag="binary"/>
+  <collation name="cp852_bin"	id="81"	order="Binary"	flag="binary"/>
 </charset>
 
 <charset name="cp1256">
diff --git a/sql/share/charsets/pclatin1.xml b/sql/share/charsets/cp850.xml
similarity index 97%
rename from sql/share/charsets/pclatin1.xml
rename to sql/share/charsets/cp850.xml
index da4b6d2ac92..ae2aebf13fa 100644
--- a/sql/share/charsets/pclatin1.xml
+++ b/sql/share/charsets/cp850.xml
@@ -2,7 +2,7 @@
 
 <charsets>
 
-<charset name="pclatin1">
+<charset name="cp850">
 
 <ctype>
 <map>
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="pclatin1">
+<collation name="cp850_general_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F
@@ -114,7 +114,7 @@
 </map>
 </collation>
 
-<collation name="pclatin1_bin"	flag="binary"/>
+<collation name="cp850_bin"	flag="binary"/>
 
 </charset>
 
diff --git a/sql/share/charsets/pclatin2.xml b/sql/share/charsets/cp852.xml
similarity index 98%
rename from sql/share/charsets/pclatin2.xml
rename to sql/share/charsets/cp852.xml
index 4402edcd847..ee434859233 100644
--- a/sql/share/charsets/pclatin2.xml
+++ b/sql/share/charsets/cp852.xml
@@ -2,7 +2,7 @@
 
 <charsets>
 
-<charset name="pclatin2">
+<charset name="cp852">
 
 <ctype>
 <map>
@@ -93,7 +93,7 @@
 </unicode>
 
 
-<collation name="pclatin2">
+<collation name="cp852_general_ci">
 <map>
  00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
  10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F