MySQL Lists: internals: bk commit - mysqldoc@docsrva tree (Mike.Hillyer:1.3184)

List:	Internals	« Previous Message Next Message »
From:	mhillyer	Date:	August 6 2005 12:55am
Subject:	bk commit - mysqldoc@docsrva tree (Mike.Hillyer:1.3184)
View as plain text
Below is the list of changes that have just been committed into a local
mysqldoc repository of root. When root 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.3184 05/08/05 16:55:14 Mike.Hillyer@stripped +26 -0
  Document Bugfixes 10214,11825,11216,11871,11822

  refman/sql-syntax.xml
    1.32 05/08/05 16:55:12 Mike.Hillyer@stripped +1 -1
    Update documentation to reflect that Latin1 is actually cp1252.

  refman/mysql-database-administration.xml
    1.42 05/08/05 16:55:12 Mike.Hillyer@stripped +1 -1
    Update documentation to reflect that Latin1 is actually cp1252.

  refman/mysql-apis.xml
    1.22 05/08/05 16:55:12 Mike.Hillyer@stripped +24 -5
    Update documentation to reflect that Latin1 is actually cp1252.

  refman/language-structure.xml
    1.8 05/08/05 16:55:12 Mike.Hillyer@stripped +2 -2
    Update documentation to reflect that Latin1 is actually cp1252.

  refman/introduction.xml
    1.23 05/08/05 16:55:12 Mike.Hillyer@stripped +2 -2
    Update documentation to reflect that Latin1 is actually cp1252.

  refman/installing.xml
    1.23 05/08/05 16:55:12 Mike.Hillyer@stripped +1 -1
    Update documentation to reflect that Latin1 is actually cp1252.

  refman/information-schema.xml
    1.12 05/08/05 16:55:12 Mike.Hillyer@stripped +1 -1
    Update documentation to reflect that Latin1 is actually cp1252.

  refman/functions.xml
    1.21 05/08/05 16:55:12 Mike.Hillyer@stripped +4 -4
    Update documentation to reflect that Latin1 is actually cp1252.

  refman/charset.xml
    1.11 05/08/05 16:55:12 Mike.Hillyer@stripped +5 -5
    Update documentation to reflect that Latin1 is actually cp1252.

  refman-common/news-5.0.xml
    1.22 05/08/05 16:55:12 Mike.Hillyer@stripped +28 -0
    Document Bugfixes.

  refman-common/news-4.1.xml
    1.15 05/08/05 16:55:12 Mike.Hillyer@stripped +12 -3
    Document Bugfixes.

  refman-5.0/sql-syntax.xml
    1.2 05/08/05 16:55:12 Mike.Hillyer@stripped +1 -1
    Sync

  refman-5.0/mysql-database-administration.xml
    1.2 05/08/05 16:55:11 Mike.Hillyer@stripped +1 -1
    Sync

  refman-5.0/language-structure.xml
    1.2 05/08/05 16:55:11 Mike.Hillyer@stripped +1 -1
    Sync

  refman-5.0/introduction.xml
    1.2 05/08/05 16:55:11 Mike.Hillyer@stripped +2 -2
    Sync

  refman-5.0/installing.xml
    1.2 05/08/05 16:55:11 Mike.Hillyer@stripped +1 -1
    Sync

  refman-5.0/information-schema.xml
    1.2 05/08/05 16:55:11 Mike.Hillyer@stripped +1 -1
    Sync

  refman-5.0/functions.xml
    1.2 05/08/05 16:55:11 Mike.Hillyer@stripped +3 -3
    Sync

  refman-5.0/charset.xml
    1.2 05/08/05 16:55:11 Mike.Hillyer@stripped +4 -4
    Sync

  refman-4.1/sql-syntax.xml
    1.25 05/08/05 16:55:11 Mike.Hillyer@stripped +1 -1
    Sync

  refman-4.1/mysql-database-administration.xml
    1.32 05/08/05 16:55:11 Mike.Hillyer@stripped +1 -1
    Sync

  refman-4.1/language-structure.xml
    1.5 05/08/05 16:55:11 Mike.Hillyer@stripped +2 -2
    Sync

  refman-4.1/introduction.xml
    1.24 05/08/05 16:55:11 Mike.Hillyer@stripped +2 -2
    Sync

  refman-4.1/installing.xml
    1.22 05/08/05 16:55:11 Mike.Hillyer@stripped +1 -1
    Sync

  refman-4.1/functions.xml
    1.22 05/08/05 16:55:11 Mike.Hillyer@stripped +4 -4
    Sync

  refman-4.1/charset.xml
    1.9 05/08/05 16:55:11 Mike.Hillyer@stripped +5 -5
    Sync

# 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:	Mike.Hillyer
# Host:	www.openwin.org
# Root:	/home/mysqldoc/mysqldoc

--- 1.14/refman-common/news-4.1.xml	2005-08-04 04:12:23 -06:00
+++ 1.15/refman-common/news-4.1.xml	2005-08-05 16:55:12 -06:00
@@ -169,6 +169,15 @@
 
       <listitem>
         <para>
+          <literal>SHOW CHARACTER SET</literal> and
+          <literal>INFORMATION_SCHEMA</literal> now properly report the
+          <literal>Latin1</literal> character set as
+          <literal>cp1252</literal>. (Bug #11216)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           <literal>MySQL Cluster</literal>: A new
<literal>-p</literal>
           option is available for use with the
           <command>ndb_mgmd</command> client. When called with this
@@ -4338,11 +4347,11 @@
     </para>
 
     <itemizedlist>
-      
+
       <listitem>
         <para>
-          A multi-table <literal>DELETE</literal> could cause MySQL to 
-          crash when using <literal>InnoDB</literal> tables. (Bug #5837, 
+          A multi-table <literal>DELETE</literal> could cause MySQL to
+          crash when using <literal>InnoDB</literal> tables. (Bug #5837,
           Bug #6378)
         </para>
       </listitem>

--- 1.21/refman-common/news-5.0.xml	2005-08-03 15:26:41 -06:00
+++ 1.22/refman-common/news-5.0.xml	2005-08-05 16:55:12 -06:00
@@ -175,6 +175,15 @@
 
       <listitem>
         <para>
+          <literal>SHOW CHARACTER SET</literal> and
+          <literal>INFORMATION_SCHEMA</literal> now properly report the
+          <literal>Latin1</literal> character set as
+          <literal>cp1252</literal>. (Bug #11216)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           <command>mysqldump</command> now dumps triggers for each
           dumped table. This can be suppressed with the
           <option>--skip-triggers</option> option. (Bug #10431)
@@ -218,6 +227,17 @@
 
       <listitem>
         <para>
+          <literal>mysql_install_db</literal> used static
+          <literal>localhost</literal> value in
<literal>GRANT</literal>
+          tables even when server hostname is not
+          <literal>localhost</literal>, such as
+          <literal>localhost.localdomain</literal>. This change is
+          applied to version 5.0.10b on Windows. (Bug #11822)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           Multiple <literal>SELECT SQL_CACHE</literal> queries in a
           stored procedure causes error and client hang. (Bug #6897)
         </para>
@@ -1063,6 +1083,14 @@
           The handling of <literal>BIT</literal> columns has been
           improved, and should now be much more reliable in a number of
           cases. (Bug #10617, Bug #11091, Bug #11572)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <literal>mysql_real_escape_string()</literal> API function now
+          respects <literal>NO_BACKSLASH_ESCAPES</literal> SQL mode.
+          (Bug #10214)
         </para>
       </listitem>
 

--- 1.8/refman-4.1/charset.xml	2005-07-30 22:24:02 -06:00
+++ 1.9/refman-4.1/charset.xml	2005-08-05 16:55:11 -06:00
@@ -231,7 +231,7 @@
 | cp850    | DOS West European           | cp850_general_ci    |      1 |
 | hp8      | HP West European            | hp8_english_ci      |      1 |
 | koi8r    | KOI8-R Relcom Russian       | koi8r_general_ci    |      1 |
-| 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 |
 | swe7     | 7bit Swedish                | swe7_swedish_ci     |      1 |
 | ascii    | US ASCII                    | ascii_general_ci    |      1 |
@@ -251,7 +251,7 @@
     <para>
       To list the collations for a character set, use the <literal>SHOW
       COLLATION</literal> statement. For example, to see the collations
-      for the <literal>latin1</literal> (<quote>ISO-8859-1 West
+      for the <literal>latin1</literal> (<quote>cp1252 West
       European</quote>) character set, use this statement to find those
       collation names that begin with <literal>latin1</literal>:
     </para>
@@ -1906,7 +1906,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 |
@@ -2746,7 +2746,7 @@
 | cp850    | DOS West European           | cp850_general_ci    |
 | hp8      | HP West European            | hp8_english_ci      |
 | koi8r    | KOI8-R Relcom Russian       | koi8r_general_ci    |
-| latin1   | ISO 8859-1 West European    | latin1_swedish_ci   |
+| latin1   | cp1252 West European        | latin1_swedish_ci   |
 | latin2   | ISO 8859-2 Central European | latin2_general_ci   |
 | swe7     | 7bit Swedish                | swe7_swedish_ci     |
 | ascii    | US ASCII                    | ascii_general_ci    |
@@ -3264,7 +3264,7 @@
 
         <listitem>
           <para>
-            <literal>latin1</literal> (ISO 8859-1 West European)
+            <literal>latin1</literal> (cp1252 West European)
             collations:
           </para>
 

--- 1.21/refman-4.1/functions.xml	2005-08-01 10:25:11 -06:00
+++ 1.22/refman-4.1/functions.xml	2005-08-05 16:55:11 -06:00
@@ -281,7 +281,7 @@
 
       <para>
         By default, string comparisons are not case sensitive and use
-        the current character set (ISO-8859-1 Latin1 by default, which
+        the current character set (cp1252 Latin1 by default, which
         also works excellently for English).
       </para>
 
@@ -2590,7 +2590,7 @@
         <para>
           Returns the string <replaceable>str</replaceable> with all
           characters changed to lowercase according to the current
-          character set mapping (the default is ISO-8859-1 Latin1).
+          character set mapping (the default is cp1252 Latin1).
         </para>
 
 <!--  end_description_for_help_topic -->
@@ -3503,7 +3503,7 @@
         <para>
           Returns the string <replaceable>str</replaceable> with all
           characters changed to uppercase according to the current
-          character set mapping (the default is ISO-8859-1 Latin1).
+          character set mapping (the default is cp1252 Latin1).
         </para>
 
 <!--  end_description_for_help_topic -->
@@ -3870,7 +3870,7 @@
 
           <para>
             <literal>REGEXP</literal> and
<literal>RLIKE</literal> use
-            the current character set (ISO-8859-1 Latin1 by default)
+            the current character set (cp1252 Latin1 by default)
             when deciding the type of a character. However, these
             operators are not multi-byte safe.
           </para>

--- 1.21/refman-4.1/installing.xml	2005-07-30 21:58:43 -06:00
+++ 1.22/refman-4.1/installing.xml	2005-08-05 16:55:11 -06:00
@@ -8079,7 +8079,7 @@
         <listitem>
           <para>
             By default, MySQL uses the <literal>latin1</literal>
-            (ISO-8859-1) character set. To change the default set, use
+            (cp1252) character set. To change the default set, use
             the <literal>--with-charset</literal> option:
 
 <programlisting>

--- 1.23/refman-4.1/introduction.xml	2005-08-01 12:47:20 -06:00
+++ 1.24/refman-4.1/introduction.xml	2005-08-05 16:55:11 -06:00
@@ -1263,7 +1263,7 @@
               <listitem>
                 <para>
                   Full support for several different character sets,
-                  including <literal>latin1</literal> (ISO-8859-1),
+                  including <literal>latin1</literal> (cp1252),
                   <literal>german</literal>,
<literal>big5</literal>,
                   <literal>ujis</literal>, and more. For example, the
                   Scandinavian characters '<literal>â</literal>',
@@ -4316,7 +4316,7 @@
               <para>
                 All string comparisons are case-insensitive by default,
                 with sort ordering determined by the current character
-                set (ISO-8859-1 Latin1 by default). If you don't like
+                set (cp1252 Latin1 by default). If you don't like
                 this, you should declare your columns with the
                 <literal>BINARY</literal> attribute or use the
                 <literal>BINARY</literal> cast, which causes comparisons

--- 1.4/refman-4.1/language-structure.xml	2005-07-30 21:58:44 -06:00
+++ 1.5/refman-4.1/language-structure.xml	2005-08-05 16:55:11 -06:00
@@ -906,7 +906,7 @@
           A name may consist of alphanumeric characters from the current
           character set, '<literal>_</literal>', and
           '<literal>$</literal>'. The default character set is
-          ISO-8859-1 (Latin1). This may be changed with the
+          cp1252 (Latin1). This may be changed with the
           <literal>--default-character-set</literal> option to
           <command>mysqld</command>. See
           <xref linkend="character-sets"/>.
@@ -1296,7 +1296,7 @@
       variable name <replaceable>var_name</replaceable> may consist of
       alphanumeric characters from the current character set,
       '<literal>.</literal>', '<literal>_</literal>', and
-      '<literal>$</literal>'. The default character set is ISO-8859-1
+      '<literal>$</literal>'. The default character set is cp1252 
       (Latin1). This may be changed with the
       <literal>--default-character-set</literal> option to
       <command>mysqld</command>. See <xref linkend="character-sets"/>.

--- 1.31/refman-4.1/mysql-database-administration.xml	2005-08-05 08:44:06 -06:00
+++ 1.32/refman-4.1/mysql-database-administration.xml	2005-08-05 16:55:11 -06:00
@@ -19187,7 +19187,7 @@
       </indexterm>
 
       <para>
-        By default, MySQL uses the ISO-8859-1 (Latin1) character set
+        By default, MySQL uses the cp1252 (Latin1) character set
         with sorting according to Swedish/Finnish rules. These defaults
         are suitable for the United States and most of western Europe.
       </para>

--- 1.24/refman-4.1/sql-syntax.xml	2005-08-04 03:10:45 -06:00
+++ 1.25/refman-4.1/sql-syntax.xml	2005-08-05 16:55:11 -06: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.10/refman/charset.xml	2005-07-30 22:24:10 -06:00
+++ 1.11/refman/charset.xml	2005-08-05 16:55:12 -06:00
@@ -231,7 +231,7 @@
 | cp850    | DOS West European           | cp850_general_ci    |      1 |
 | hp8      | HP West European            | hp8_english_ci      |      1 |
 | koi8r    | KOI8-R Relcom Russian       | koi8r_general_ci    |      1 |
-| 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 |
 | swe7     | 7bit Swedish                | swe7_swedish_ci     |      1 |
 | ascii    | US ASCII                    | ascii_general_ci    |      1 |
@@ -251,7 +251,7 @@
     <para>
       To list the collations for a character set, use the <literal>SHOW
       COLLATION</literal> statement. For example, to see the collations
-      for the <literal>latin1</literal> (<quote>ISO-8859-1 West
+      for the <literal>latin1</literal> (<quote>cp1252 West
       European</quote>) character set, use this statement to find those
       collation names that begin with <literal>latin1</literal>:
     </para>
@@ -1906,7 +1906,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 |
@@ -2746,7 +2746,7 @@
 | cp850    | DOS West European           | cp850_general_ci    |
 | hp8      | HP West European            | hp8_english_ci      |
 | koi8r    | KOI8-R Relcom Russian       | koi8r_general_ci    |
-| latin1   | ISO 8859-1 West European    | latin1_swedish_ci   |
+| latin1   | cp1252 West European        | latin1_swedish_ci   |
 | latin2   | ISO 8859-2 Central European | latin2_general_ci   |
 | swe7     | 7bit Swedish                | swe7_swedish_ci     |
 | ascii    | US ASCII                    | ascii_general_ci    |
@@ -3264,7 +3264,7 @@
 
         <listitem>
           <para>
-            <literal>latin1</literal> (ISO 8859-1 West European)
+            <literal>latin1</literal> (cp1252 West European)
             collations:
           </para>
 

--- 1.20/refman/functions.xml	2005-08-01 10:24:24 -06:00
+++ 1.21/refman/functions.xml	2005-08-05 16:55:12 -06:00
@@ -281,7 +281,7 @@
 
       <para>
         By default, string comparisons are not case sensitive and use
-        the current character set (ISO-8859-1 Latin1 by default, which
+        the current character set (cp1252 Latin1 by default, which
         also works excellently for English).
       </para>
 
@@ -2590,7 +2590,7 @@
         <para>
           Returns the string <replaceable>str</replaceable> with all
           characters changed to lowercase according to the current
-          character set mapping (the default is ISO-8859-1 Latin1).
+          character set mapping (the default is cp1252 Latin1).
         </para>
 
 <!--  end_description_for_help_topic -->
@@ -3503,7 +3503,7 @@
         <para>
           Returns the string <replaceable>str</replaceable> with all
           characters changed to uppercase according to the current
-          character set mapping (the default is ISO-8859-1 Latin1).
+          character set mapping (the default is cp1252 Latin1).
         </para>
 
 <!--  end_description_for_help_topic -->
@@ -3870,7 +3870,7 @@
 
           <para>
             <literal>REGEXP</literal> and
<literal>RLIKE</literal> use
-            the current character set (ISO-8859-1 Latin1 by default)
+            the current character set (cp1252 Latin1 by default)
             when deciding the type of a character. However, these
             operators are not multi-byte safe.
           </para>

--- 1.11/refman/information-schema.xml	2005-07-30 01:47:31 -06:00
+++ 1.12/refman/information-schema.xml	2005-08-05 16:55:12 -06:00
@@ -3415,7 +3415,7 @@
 | cp850    | DOS West European           | cp850_general_ci    |      1 |
 | hp8      | HP West European            | hp8_english_ci      |      1 |
 | koi8r    | KOI8-R Relcom Russian       | koi8r_general_ci    |      1 |
-| 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 |
 
 ...

--- 1.22/refman/installing.xml	2005-08-04 03:57:21 -06:00
+++ 1.23/refman/installing.xml	2005-08-05 16:55:12 -06:00
@@ -8038,7 +8038,7 @@
         <listitem>
           <para>
             By default, MySQL uses the <literal>latin1</literal>
-            (ISO-8859-1) character set. To change the default set, use
+            (cp1252) character set. To change the default set, use
             the <literal>--with-charset</literal> option:
 
 <programlisting>

--- 1.22/refman/introduction.xml	2005-08-01 12:47:22 -06:00
+++ 1.23/refman/introduction.xml	2005-08-05 16:55:12 -06:00
@@ -1255,7 +1255,7 @@
               <listitem>
                 <para>
                   Full support for several different character sets,
-                  including <literal>latin1</literal> (ISO-8859-1),
+                  including <literal>latin1</literal> (cp1252),
                   <literal>german</literal>,
<literal>big5</literal>,
                   <literal>ujis</literal>, and more. For example, the
                   Scandinavian characters '<literal>â</literal>',
@@ -4361,7 +4361,7 @@
               <para>
                 All string comparisons are case-insensitive by default,
                 with sort ordering determined by the current character
-                set (ISO-8859-1 Latin1 by default). If you don't like
+                set (cp1252 Latin1 by default). If you don't like
                 this, you should declare your columns with the
                 <literal>BINARY</literal> attribute or use the
                 <literal>BINARY</literal> cast, which causes comparisons

--- 1.7/refman/language-structure.xml	2005-07-30 21:59:35 -06:00
+++ 1.8/refman/language-structure.xml	2005-08-05 16:55:12 -06:00
@@ -906,7 +906,7 @@
           A name may consist of alphanumeric characters from the current
           character set, '<literal>_</literal>', and
           '<literal>$</literal>'. The default character set is
-          ISO-8859-1 (Latin1). This may be changed with the
+          cp1252 (Latin1). This may be changed with the
           <literal>--default-character-set</literal> option to
           <command>mysqld</command>. See
           <xref linkend="character-sets"/>.
@@ -1302,7 +1302,7 @@
       variable name <replaceable>var_name</replaceable> may consist of
       alphanumeric characters from the current character set,
       '<literal>.</literal>', '<literal>_</literal>', and
-      '<literal>$</literal>'. The default character set is ISO-8859-1
+      '<literal>$</literal>'. The default character set is cp1252 
       (Latin1). This may be changed with the
       <literal>--default-character-set</literal> option to
       <command>mysqld</command>. See <xref linkend="character-sets"/>.

--- 1.21/refman/mysql-apis.xml	2005-07-30 21:59:36 -06:00
+++ 1.22/refman/mysql-apis.xml	2005-08-05 16:55:12 -06:00
@@ -378,11 +378,12 @@
     </para>
 
     <para>
-      Most of the other client APIs (all except Connector/J) use the
-      <literal>mysqlclient</literal> library to communicate with the
-      MySQL server. This means that, for example, you can take advantage
-      of many of the same environment variables that are used by other
-      client programs, because they are referenced from the library. See
+      Most of the other client APIs (all except Connector/J and
+      Connector/NET) use the <literal>mysqlclient</literal> library to
+      communicate with the MySQL server. This means that, for example,
+      you can take advantage of many of the same environment variables
+      that are used by other client programs, because they are
+      referenced from the library. See
       <xref linkend="client-side-scripts"/>, for a list of these
       variables.
     </para>
@@ -5664,6 +5665,17 @@
         </para>
 
         <para>
+          When <literal>NO_BACKSLASH_ESCAPES</literal> is on,
+          <literal>mysql_real_escape_string()</literal> will only escape
+          single quotes by doubling them. If the server has the
+          <literal>NO_BACKSLASH_ESCAPES</literal> SQL mode set, you
+          should not use <literal>mysql_real_escape_string()</literal>
+          for binary data. Instead use
+          <literal>mysql_hex_string()</literal>. See
+          <xref linkend="mysql-hex-string" />
+        </para>
+
+        <para>
           <emphasis role="bold">Example</emphasis>
         </para>
 
@@ -6882,6 +6894,13 @@
         <para>
           You must call <literal>mysql_free_result()</literal> once you
           are done with the result set.
+        </para>
+
+        <para>
+          When using the <literal>libmysqld</literal> embedded server,
+          the memory benefits are essentially lost because memory usage
+          incrementally increases with each row retrieved until
+          <literal>mysql_free_result()</literal> is called.
         </para>
 
         <para>

--- 1.41/refman/mysql-database-administration.xml	2005-08-05 08:44:05 -06:00
+++ 1.42/refman/mysql-database-administration.xml	2005-08-05 16:55:12 -06:00
@@ -21586,7 +21586,7 @@
       </indexterm>
 
       <para>
-        By default, MySQL uses the ISO-8859-1 (Latin1) character set
+        By default, MySQL uses the cp1252 (Latin1) character set
         with sorting according to Swedish/Finnish rules. These defaults
         are suitable for the United States and most of western Europe.
       </para>

--- 1.31/refman/sql-syntax.xml	2005-08-04 04:32:59 -06:00
+++ 1.32/refman/sql-syntax.xml	2005-08-05 16:55:12 -06: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.1/refman-5.0/charset.xml	2005-08-05 11:11:25 -06:00
+++ 1.2/refman-5.0/charset.xml	2005-08-05 16:55:11 -06:00
@@ -217,7 +217,7 @@
 | cp850    | DOS West European           | cp850_general_ci    |      1 |
 | hp8      | HP West European            | hp8_english_ci      |      1 |
 | koi8r    | KOI8-R Relcom Russian       | koi8r_general_ci    |      1 |
-| 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 |
 | swe7     | 7bit Swedish                | swe7_swedish_ci     |      1 |
 | ascii    | US ASCII                    | ascii_general_ci    |      1 |
@@ -247,7 +247,7 @@
     <para>
       To list the collations for a character set, use the <literal>SHOW
       COLLATION</literal> statement. For example, to see the collations
-      for the <literal>latin1</literal> (<quote>ISO-8859-1 West
+      for the <literal>latin1</literal> (<quote>cp1252 West
       European</quote>) character set, use this statement to find those
       collation names that begin with <literal>latin1</literal>:
     </para>
@@ -1835,7 +1835,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 |
@@ -2620,7 +2620,7 @@
 
         <listitem>
           <para>
-            <literal>latin1</literal> (ISO 8859-1 West European)
+            <literal>latin1</literal> (cp1252 West European)
             collations:
           </para>
 

--- 1.1/refman-5.0/functions.xml	2005-08-05 11:11:25 -06:00
+++ 1.2/refman-5.0/functions.xml	2005-08-05 16:55:11 -06:00
@@ -281,7 +281,7 @@
 
       <para>
         By default, string comparisons are not case sensitive and use
-        the current character set (ISO-8859-1 Latin1 by default, which
+        the current character set (cp1252 Latin1 by default, which
         also works excellently for English).
       </para>
 
@@ -2540,7 +2540,7 @@
         <para>
           Returns the string <replaceable>str</replaceable> with all
           characters changed to lowercase according to the current
-          character set mapping (the default is ISO-8859-1 Latin1).
+          character set mapping (the default is cp1252 Latin1).
         </para>
 
 <!--  end_description_for_help_topic -->
@@ -3439,7 +3439,7 @@
         <para>
           Returns the string <replaceable>str</replaceable> with all
           characters changed to uppercase according to the current
-          character set mapping (the default is ISO-8859-1 Latin1).
+          character set mapping (the default is cp1252 Latin1).
         </para>
 
 <!--  end_description_for_help_topic -->

--- 1.1/refman-5.0/information-schema.xml	2005-08-05 11:11:25 -06:00
+++ 1.2/refman-5.0/information-schema.xml	2005-08-05 16:55:11 -06:00
@@ -3425,7 +3425,7 @@
 | cp850    | DOS West European           | cp850_general_ci    |      1 |
 | hp8      | HP West European            | hp8_english_ci      |      1 |
 | koi8r    | KOI8-R Relcom Russian       | koi8r_general_ci    |      1 |
-| 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 |
 
 ...

--- 1.1/refman-5.0/installing.xml	2005-08-05 11:11:25 -06:00
+++ 1.2/refman-5.0/installing.xml	2005-08-05 16:55:11 -06:00
@@ -8024,7 +8024,7 @@
         <listitem>
           <para>
             By default, MySQL uses the <literal>latin1</literal>
-            (ISO-8859-1) character set. To change the default set, use
+            (cp1252) character set. To change the default set, use
             the <literal>--with-charset</literal> option:
 
 <programlisting>

--- 1.1/refman-5.0/introduction.xml	2005-08-05 11:11:25 -06:00
+++ 1.2/refman-5.0/introduction.xml	2005-08-05 16:55:11 -06:00
@@ -1252,7 +1252,7 @@
               <listitem>
                 <para>
                   Full support for several different character sets,
-                  including <literal>latin1</literal> (ISO-8859-1),
+                  including <literal>latin1</literal> (cp1252),
                   <literal>german</literal>,
<literal>big5</literal>,
                   <literal>ujis</literal>, and more. For example, the
                   Scandinavian characters '<literal>â</literal>',
@@ -3815,7 +3815,7 @@
               <para>
                 All string comparisons are case-insensitive by default,
                 with sort ordering determined by the current character
-                set (ISO-8859-1 Latin1 by default). If you don't like
+                set (cp1252 Latin1 by default). If you don't like
                 this, you should declare your columns with the
                 <literal>BINARY</literal> attribute or use the
                 <literal>BINARY</literal> cast, which causes comparisons

--- 1.1/refman-5.0/language-structure.xml	2005-08-05 11:11:25 -06:00
+++ 1.2/refman-5.0/language-structure.xml	2005-08-05 16:55:11 -06:00
@@ -1252,7 +1252,7 @@
       variable name <replaceable>var_name</replaceable> may consist of
       alphanumeric characters from the current character set,
       '<literal>.</literal>', '<literal>_</literal>', and
-      '<literal>$</literal>'. The default character set is ISO-8859-1
+      '<literal>$</literal>'. The default character set is cp1252 
       (Latin1). This may be changed with the
       <literal>--default-character-set</literal> option to
       <command>mysqld</command>. See <xref linkend="character-sets"/>.

--- 1.1/refman-5.0/mysql-database-administration.xml	2005-08-05 11:11:25 -06:00
+++ 1.2/refman-5.0/mysql-database-administration.xml	2005-08-05 16:55:11 -06:00
@@ -21039,7 +21039,7 @@
       </indexterm>
 
       <para>
-        By default, MySQL uses the ISO-8859-1 (Latin1) character set
+        By default, MySQL uses the cp1252 (Latin1) character set
         with sorting according to Swedish/Finnish rules. These defaults
         are suitable for the United States and most of Western Europe.
       </para>

--- 1.1/refman-5.0/sql-syntax.xml	2005-08-05 11:11:26 -06:00
+++ 1.2/refman-5.0/sql-syntax.xml	2005-08-05 16:55:12 -06: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 |
Thread
• bk commit - mysqldoc@docsrva tree (Mike.Hillyer:1.3184)	mhillyer	6 Aug