bk commit - mysqldoc@docsrva tree (stefan:1.3186)

[stefan]

Below is the list of changes that have just been committed into a local
mysqldoc repository of stefan. When stefan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3186 05/08/06 07:00:28 stefan@stripped +3 -0
  Merge bk://mysqldoc@stripped
  into apollon.site:/home/stefan/bk/mysqldoc

  refman-5.0/sql-syntax.xml
    1.3 05/08/06 07:00:27 stefan@stripped +0 -0
    Auto merged

  refman-4.1/sql-syntax.xml
    1.26 05/08/06 07:00:26 stefan@stripped +0 -0
    Auto merged

  refman/sql-syntax.xml
    1.33 05/08/06 07:00:25 stefan@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stefan
# Host:	apollon.site
# Root:	/home/stefan/bk/mysqldoc/RESYNC

--- 1.25/refman-4.1/sql-syntax.xml	2005-08-05 23:04:13 +02:00
+++ 1.26/refman-4.1/sql-syntax.xml	2005-08-06 07:00:26 +02:00
@@ -13083,7 +13083,7 @@
 +---------+-----------------------------+-------------------+--------+
 | Charset | Description                 | Default collation | Maxlen |
 +---------+-----------------------------+-------------------+--------+
-| latin1  | ISO 8859-1 West European    | latin1_swedish_ci |      1 |
+| latin1  | cp1252 West European        | latin1_swedish_ci |      1 |
 | latin2  | ISO 8859-2 Central European | latin2_general_ci |      1 |
 | latin5  | ISO 8859-9 Turkish          | latin5_turkish_ci |      1 |
 | latin7  | ISO 8859-13 Baltic          | latin7_general_ci |      1 |

--- 1.32/refman/sql-syntax.xml	2005-08-05 23:03:48 +02:00
+++ 1.33/refman/sql-syntax.xml	2005-08-06 07:00:25 +02:00
@@ -13202,7 +13202,7 @@
 +---------+-----------------------------+-------------------+--------+
 | Charset | Description                 | Default collation | Maxlen |
 +---------+-----------------------------+-------------------+--------+
-| latin1  | ISO 8859-1 West European    | latin1_swedish_ci |      1 |
+| latin1  | cp1252 West European        | latin1_swedish_ci |      1 |
 | latin2  | ISO 8859-2 Central European | latin2_general_ci |      1 |
 | latin5  | ISO 8859-9 Turkish          | latin5_turkish_ci |      1 |
 | latin7  | ISO 8859-13 Baltic          | latin7_general_ci |      1 |

--- 1.2/refman-5.0/sql-syntax.xml	2005-08-05 23:04:16 +02:00
+++ 1.3/refman-5.0/sql-syntax.xml	2005-08-06 07:00:27 +02:00
@@ -12814,7 +12814,7 @@
 +---------+-----------------------------+-------------------+--------+
 | Charset | Description                 | Default collation | Maxlen |
 +---------+-----------------------------+-------------------+--------+
-| latin1  | ISO 8859-1 West European    | latin1_swedish_ci |      1 |
+| latin1  | cp1252 West European        | latin1_swedish_ci |      1 |
 | latin2  | ISO 8859-2 Central European | latin2_general_ci |      1 |
 | latin5  | ISO 8859-9 Turkish          | latin5_turkish_ci |      1 |
 | latin7  | ISO 8859-13 Baltic          | latin7_general_ci |      1 |