svn commit - mysqldoc@docsrva: r5112 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2007-02-28 16:11:52 +0100 (Wed, 28 Feb 2007)
New Revision: 5112

Log:
 r16858@frost:  paul | 2007-02-28 08:43:36 -0600
 Additional info about the sequence of initialization calls.


Modified:
   trunk/refman-4.1/apis-c.xml
   trunk/refman-5.0/apis-c.xml
   trunk/refman-5.1/apis-c.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:20600
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:16857
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:20600
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:16858
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593


Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml	2007-02-28 15:11:26 UTC (rev 5111)
+++ trunk/refman-4.1/apis-c.xml	2007-02-28 15:11:52 UTC (rev 5112)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 5; 1321 bytes

@@ -12641,8 +12641,13 @@
 
       <para>
         <literal>mysql_thread_init()</literal> is automatically called
-        by <literal>my_init()</literal> and
-        <literal>mysql_connect()</literal>.
+        by <literal>my_init()</literal> (which itself is automatically
+        called by <literal>mysql_init()</literal>,
+        <literal>mysql_library_init()</literal>,
+        <literal>mysql_server_init()</literal>, and
+        <literal>mysql_connect()</literal>). This means you need not
+        necessarily invoke <literal>mysql_thread_init()</literal>
+        explicitly.
       </para>
 
       <para>

@@ -13515,9 +13520,9 @@
 
       <listitem>
         <para>
-          Call <literal>my_init()</literal> at the start of your program
-          if it calls any other MySQL function before calling
-          <literal>mysql_real_connect()</literal>.
+          Call <literal>mysql_library_init()</literal> before any other
+          MySQL functions. It is not thread-safe, so call it before
+          threads are created, or protect the call with a mutex.
         </para>
       </listitem>
 


Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml	2007-02-28 15:11:26 UTC (rev 5111)
+++ trunk/refman-5.0/apis-c.xml	2007-02-28 15:11:52 UTC (rev 5112)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 5; 1321 bytes

@@ -12784,8 +12784,13 @@
 
       <para>
         <literal>mysql_thread_init()</literal> is automatically called
-        by <literal>my_init()</literal> and
-        <literal>mysql_connect()</literal>.
+        by <literal>my_init()</literal> (which itself is automatically
+        called by <literal>mysql_init()</literal>,
+        <literal>mysql_library_init()</literal>,
+        <literal>mysql_server_init()</literal>, and
+        <literal>mysql_connect()</literal>). This means you need not
+        necessarily invoke <literal>mysql_thread_init()</literal>
+        explicitly.
       </para>
 
       <para>

@@ -13668,9 +13673,9 @@
 
       <listitem>
         <para>
-          Call <literal>my_init()</literal> at the start of your program
-          if it calls any other MySQL function before calling
-          <literal>mysql_real_connect()</literal>.
+          Call <literal>mysql_library_init()</literal> before any other
+          MySQL functions. It is not thread-safe, so call it before
+          threads are created, or protect the call with a mutex.
         </para>
       </listitem>
 


Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml	2007-02-28 15:11:26 UTC (rev 5111)
+++ trunk/refman-5.1/apis-c.xml	2007-02-28 15:11:52 UTC (rev 5112)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 5; 1321 bytes

@@ -12826,8 +12826,13 @@
 
       <para>
         <literal>mysql_thread_init()</literal> is automatically called
-        by <literal>my_init()</literal> and
-        <literal>mysql_connect()</literal>.
+        by <literal>my_init()</literal> (which itself is automatically
+        called by <literal>mysql_init()</literal>,
+        <literal>mysql_library_init()</literal>,
+        <literal>mysql_server_init()</literal>, and
+        <literal>mysql_connect()</literal>). This means you need not
+        necessarily invoke <literal>mysql_thread_init()</literal>
+        explicitly.
       </para>
 
       <para>

@@ -13688,9 +13693,9 @@
 
       <listitem>
         <para>
-          Call <literal>my_init()</literal> at the start of your program
-          if it calls any other MySQL function before calling
-          <literal>mysql_real_connect()</literal>.
+          Call <literal>mysql_library_init()</literal> before any other
+          MySQL functions. It is not thread-safe, so call it before
+          threads are created, or protect the call with a mutex.
         </para>
       </listitem>