Author: paul
Date: 2007-02-28 16:11:26 +0100 (Wed, 28 Feb 2007)
New Revision: 5111
Log:
r16857@frost: paul | 2007-02-28 08:28:07 -0600
Rewrite my_init() description:
- Don't say it must be called first *and* that other functions call it
(which implies that it need not be called first)
- Point out when you need not invoke it explicitly
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:16856
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:16857
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:04 UTC (rev 5110)
+++ trunk/refman-4.1/apis-c.xml 2007-02-28 15:11:26 UTC (rev 5111)
Changed blocks: 1, Lines Added: 12, Lines Deleted: 8; 1647 bytes
@@ -12580,19 +12580,23 @@
</para>
<para>
- This function needs to be called once in the program before
- calling any MySQL function. <literal>my_init()</literal>
- initializes some global variables that MySQL needs. If you are
- using a thread-safe client library, it also calls
- <literal>mysql_thread_init()</literal> for this thread.
+ <literal>my_init()</literal> initializes some global variables
+ that MySQL needs. If you are using a thread-safe client library,
+ it also calls <literal>mysql_thread_init()</literal> for this
+ thread.
</para>
<para>
- <literal>my_init()</literal> is automatically called by
- <literal>mysql_init()</literal>,
+ It is necessary for <literal>my_init()</literal> to be called
+ early in the initialization phase of a program's use of the
+ MySQL library. However, <literal>my_init()</literal> is
+ automatically called by <literal>mysql_init()</literal>,
<literal>mysql_library_init()</literal>,
<literal>mysql_server_init()</literal>, and
- <literal>mysql_connect()</literal>.
+ <literal>mysql_connect()</literal>. If you ensure that your
+ program invokes one of those functions before any other MySQL
+ calls, there is no need to invoke <literal>my_init()</literal>
+ explicitly.
</para>
<para>
Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml 2007-02-28 15:11:04 UTC (rev 5110)
+++ trunk/refman-5.0/apis-c.xml 2007-02-28 15:11:26 UTC (rev 5111)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 9; 1698 bytes
@@ -12723,19 +12723,23 @@
</para>
<para>
- This function needs to be called once in the program before
- calling any MySQL function. <literal>my_init()</literal>
- initializes some global variables that MySQL needs. If you are
- using a thread-safe client library, it also calls
- <literal>mysql_thread_init()</literal> for this thread.
+ <literal>my_init()</literal> initializes some global variables
+ that MySQL needs. If you are using a thread-safe client library,
+ it also calls <literal>mysql_thread_init()</literal> for this
+ thread.
</para>
<para>
- <literal>my_init()</literal> is automatically called by
- <literal>mysql_init()</literal>,
+ It is necessary for <literal>my_init()</literal> to be called
+ early in the initialization phase of a program's use of the
+ MySQL library. However, <literal>my_init()</literal> is
+ automatically called by <literal>mysql_init()</literal>,
<literal>mysql_library_init()</literal>,
- <literal>mysql_server_init()</literal> and
- <literal>mysql_connect()</literal>.
+ <literal>mysql_server_init()</literal>, and
+ <literal>mysql_connect()</literal>. If you ensure that your
+ program invokes one of those functions before any other MySQL
+ calls, there is no need to invoke <literal>my_init()</literal>
+ explicitly.
</para>
<para>
Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml 2007-02-28 15:11:04 UTC (rev 5110)
+++ trunk/refman-5.1/apis-c.xml 2007-02-28 15:11:26 UTC (rev 5111)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 9; 1698 bytes
@@ -12765,19 +12765,23 @@
</para>
<para>
- This function needs to be called once in the program before
- calling any MySQL function. <literal>my_init()</literal>
- initializes some global variables that MySQL needs. If you are
- using a thread-safe client library, it also calls
- <literal>mysql_thread_init()</literal> for this thread.
+ <literal>my_init()</literal> initializes some global variables
+ that MySQL needs. If you are using a thread-safe client library,
+ it also calls <literal>mysql_thread_init()</literal> for this
+ thread.
</para>
<para>
- <literal>my_init()</literal> is automatically called by
- <literal>mysql_init()</literal>,
+ It is necessary for <literal>my_init()</literal> to be called
+ early in the initialization phase of a program's use of the
+ MySQL library. However, <literal>my_init()</literal> is
+ automatically called by <literal>mysql_init()</literal>,
<literal>mysql_library_init()</literal>,
- <literal>mysql_server_init()</literal> and
- <literal>mysql_connect()</literal>.
+ <literal>mysql_server_init()</literal>, and
+ <literal>mysql_connect()</literal>. If you ensure that your
+ program invokes one of those functions before any other MySQL
+ calls, there is no need to invoke <literal>my_init()</literal>
+ explicitly.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5111 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 28 Feb |
