Author: paul
Date: 2007-10-06 23:21:10 +0200 (Sat, 06 Oct 2007)
New Revision: 8007
Log:
r25379@frost: paul | 2007-10-06 16:17:15 -0500
Reverse two out-of-order functions.
Modified:
trunk/refman-4.1/apis-c.xml
trunk/refman-5.0/apis-c.xml
trunk/refman-5.1/apis-c.xml
trunk/refman-5.2/apis-c.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30756
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25375
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30756
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25379
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml 2007-10-06 21:05:53 UTC (rev 8006)
+++ trunk/refman-4.1/apis-c.xml 2007-10-06 21:21:10 UTC (rev 8007)
Changed blocks: 3, Lines Added: 31, Lines Deleted: 31; 3965 bytes
@@ -12755,16 +12755,16 @@
</section>
- <section id="mysql-thread-init">
+ <section id="mysql-thread-end">
- <title><literal>mysql_thread_init()</literal></title>
+ <title><literal>mysql_thread_end()</literal></title>
<indexterm>
- <primary><literal>mysql_thread_init()</literal></primary>
+ <primary><literal>mysql_thread_end()</literal></primary>
</indexterm>
<para>
- <literal>my_bool mysql_thread_init(void)</literal>
+ <literal>void mysql_thread_end(void)</literal>
</para>
<para>
@@ -12772,39 +12772,38 @@
</para>
<para>
- This function must be called early within each created thread to
- initialize thread-specific variables. However, you may not
- necessarily need to invoke it explicitly:
- <literal>mysql_thread_init()</literal> is automatically called
- 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>. If you invoke any of those
- functions, <literal>mysql_thread_init()</literal> will be called
- for you.
+ This function needs to be called before calling
+ <literal>pthread_exit()</literal> to free memory allocated by
+ <literal>mysql_thread_init()</literal>.
</para>
<para>
+ Note that this <literal>mysql_thread_end()</literal>
+ <emphasis>is not invoked automatically by the client
+ library</emphasis>. It must be called explicitly to avoid a
+ memory leak.
+ </para>
+
+ <para>
<emphasis role="bold">Return Values</emphasis>
</para>
<para>
- Zero if successful. Non-zero if an error occurred.
+ None.
</para>
</section>
- <section id="mysql-thread-end">
+ <section id="mysql-thread-init">
- <title><literal>mysql_thread_end()</literal></title>
+ <title><literal>mysql_thread_init()</literal></title>
<indexterm>
- <primary><literal>mysql_thread_end()</literal></primary>
+ <primary><literal>mysql_thread_init()</literal></primary>
</indexterm>
<para>
- <literal>void mysql_thread_end(void)</literal>
+ <literal>my_bool mysql_thread_init(void)</literal>
</para>
<para>
@@ -12812,24 +12811,25 @@
</para>
<para>
- This function needs to be called before calling
- <literal>pthread_exit()</literal> to free memory allocated by
- <literal>mysql_thread_init()</literal>.
+ This function must be called early within each created thread to
+ initialize thread-specific variables. However, you may not
+ necessarily need to invoke it explicitly:
+ <literal>mysql_thread_init()</literal> is automatically called
+ 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>. If you invoke any of those
+ functions, <literal>mysql_thread_init()</literal> will be called
+ for you.
</para>
<para>
- Note that this <literal>mysql_thread_end()</literal>
- <emphasis>is not invoked automatically by the client
- library</emphasis>. It must be called explicitly to avoid a
- memory leak.
- </para>
-
- <para>
<emphasis role="bold">Return Values</emphasis>
</para>
<para>
- None.
+ Zero if successful. Non-zero if an error occurred.
</para>
</section>
Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml 2007-10-06 21:05:53 UTC (rev 8006)
+++ trunk/refman-5.0/apis-c.xml 2007-10-06 21:21:10 UTC (rev 8007)
Changed blocks: 3, Lines Added: 31, Lines Deleted: 31; 3965 bytes
@@ -12876,16 +12876,16 @@
</section>
- <section id="mysql-thread-init">
+ <section id="mysql-thread-end">
- <title><literal>mysql_thread_init()</literal></title>
+ <title><literal>mysql_thread_end()</literal></title>
<indexterm>
- <primary><literal>mysql_thread_init()</literal></primary>
+ <primary><literal>mysql_thread_end()</literal></primary>
</indexterm>
<para>
- <literal>my_bool mysql_thread_init(void)</literal>
+ <literal>void mysql_thread_end(void)</literal>
</para>
<para>
@@ -12893,39 +12893,38 @@
</para>
<para>
- This function must be called early within each created thread to
- initialize thread-specific variables. However, you may not
- necessarily need to invoke it explicitly:
- <literal>mysql_thread_init()</literal> is automatically called
- 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>. If you invoke any of those
- functions, <literal>mysql_thread_init()</literal> will be called
- for you.
+ This function needs to be called before calling
+ <literal>pthread_exit()</literal> to free memory allocated by
+ <literal>mysql_thread_init()</literal>.
</para>
<para>
+ Note that this <literal>mysql_thread_end()</literal>
+ <emphasis>is not invoked automatically by the client
+ library</emphasis>. It must be called explicitly to avoid a
+ memory leak.
+ </para>
+
+ <para>
<emphasis role="bold">Return Values</emphasis>
</para>
<para>
- Zero if successful. Non-zero if an error occurred.
+ None.
</para>
</section>
- <section id="mysql-thread-end">
+ <section id="mysql-thread-init">
- <title><literal>mysql_thread_end()</literal></title>
+ <title><literal>mysql_thread_init()</literal></title>
<indexterm>
- <primary><literal>mysql_thread_end()</literal></primary>
+ <primary><literal>mysql_thread_init()</literal></primary>
</indexterm>
<para>
- <literal>void mysql_thread_end(void)</literal>
+ <literal>my_bool mysql_thread_init(void)</literal>
</para>
<para>
@@ -12933,24 +12932,25 @@
</para>
<para>
- This function needs to be called before calling
- <literal>pthread_exit()</literal> to free memory allocated by
- <literal>mysql_thread_init()</literal>.
+ This function must be called early within each created thread to
+ initialize thread-specific variables. However, you may not
+ necessarily need to invoke it explicitly:
+ <literal>mysql_thread_init()</literal> is automatically called
+ 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>. If you invoke any of those
+ functions, <literal>mysql_thread_init()</literal> will be called
+ for you.
</para>
<para>
- Note that this <literal>mysql_thread_end()</literal>
- <emphasis>is not invoked automatically by the client
- library</emphasis>. It must be called explicitly to avoid a
- memory leak.
- </para>
-
- <para>
<emphasis role="bold">Return Values</emphasis>
</para>
<para>
- None.
+ Zero if successful. Non-zero if an error occurred.
</para>
</section>
Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml 2007-10-06 21:05:53 UTC (rev 8006)
+++ trunk/refman-5.1/apis-c.xml 2007-10-06 21:21:10 UTC (rev 8007)
Changed blocks: 3, Lines Added: 31, Lines Deleted: 31; 3965 bytes
@@ -12981,16 +12981,16 @@
</section>
- <section id="mysql-thread-init">
+ <section id="mysql-thread-end">
- <title><literal>mysql_thread_init()</literal></title>
+ <title><literal>mysql_thread_end()</literal></title>
<indexterm>
- <primary><literal>mysql_thread_init()</literal></primary>
+ <primary><literal>mysql_thread_end()</literal></primary>
</indexterm>
<para>
- <literal>my_bool mysql_thread_init(void)</literal>
+ <literal>void mysql_thread_end(void)</literal>
</para>
<para>
@@ -12998,39 +12998,38 @@
</para>
<para>
- This function must be called early within each created thread to
- initialize thread-specific variables. However, you may not
- necessarily need to invoke it explicitly:
- <literal>mysql_thread_init()</literal> is automatically called
- 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>. If you invoke any of those
- functions, <literal>mysql_thread_init()</literal> will be called
- for you.
+ This function needs to be called before calling
+ <literal>pthread_exit()</literal> to free memory allocated by
+ <literal>mysql_thread_init()</literal>.
</para>
<para>
+ Note that this <literal>mysql_thread_end()</literal>
+ <emphasis>is not invoked automatically by the client
+ library</emphasis>. It must be called explicitly to avoid a
+ memory leak.
+ </para>
+
+ <para>
<emphasis role="bold">Return Values</emphasis>
</para>
<para>
- Zero if successful. Non-zero if an error occurred.
+ None.
</para>
</section>
- <section id="mysql-thread-end">
+ <section id="mysql-thread-init">
- <title><literal>mysql_thread_end()</literal></title>
+ <title><literal>mysql_thread_init()</literal></title>
<indexterm>
- <primary><literal>mysql_thread_end()</literal></primary>
+ <primary><literal>mysql_thread_init()</literal></primary>
</indexterm>
<para>
- <literal>void mysql_thread_end(void)</literal>
+ <literal>my_bool mysql_thread_init(void)</literal>
</para>
<para>
@@ -13038,24 +13037,25 @@
</para>
<para>
- This function needs to be called before calling
- <literal>pthread_exit()</literal> to free memory allocated by
- <literal>mysql_thread_init()</literal>.
+ This function must be called early within each created thread to
+ initialize thread-specific variables. However, you may not
+ necessarily need to invoke it explicitly:
+ <literal>mysql_thread_init()</literal> is automatically called
+ 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>. If you invoke any of those
+ functions, <literal>mysql_thread_init()</literal> will be called
+ for you.
</para>
<para>
- Note that this <literal>mysql_thread_end()</literal>
- <emphasis>is not invoked automatically by the client
- library</emphasis>. It must be called explicitly to avoid a
- memory leak.
- </para>
-
- <para>
<emphasis role="bold">Return Values</emphasis>
</para>
<para>
- None.
+ Zero if successful. Non-zero if an error occurred.
</para>
</section>
Modified: trunk/refman-5.2/apis-c.xml
===================================================================
--- trunk/refman-5.2/apis-c.xml 2007-10-06 21:05:53 UTC (rev 8006)
+++ trunk/refman-5.2/apis-c.xml 2007-10-06 21:21:10 UTC (rev 8007)
Changed blocks: 3, Lines Added: 31, Lines Deleted: 31; 3965 bytes
@@ -12921,16 +12921,16 @@
</section>
- <section id="mysql-thread-init">
+ <section id="mysql-thread-end">
- <title><literal>mysql_thread_init()</literal></title>
+ <title><literal>mysql_thread_end()</literal></title>
<indexterm>
- <primary><literal>mysql_thread_init()</literal></primary>
+ <primary><literal>mysql_thread_end()</literal></primary>
</indexterm>
<para>
- <literal>my_bool mysql_thread_init(void)</literal>
+ <literal>void mysql_thread_end(void)</literal>
</para>
<para>
@@ -12938,39 +12938,38 @@
</para>
<para>
- This function must be called early within each created thread to
- initialize thread-specific variables. However, you may not
- necessarily need to invoke it explicitly:
- <literal>mysql_thread_init()</literal> is automatically called
- 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>. If you invoke any of those
- functions, <literal>mysql_thread_init()</literal> will be called
- for you.
+ This function needs to be called before calling
+ <literal>pthread_exit()</literal> to free memory allocated by
+ <literal>mysql_thread_init()</literal>.
</para>
<para>
+ Note that this <literal>mysql_thread_end()</literal>
+ <emphasis>is not invoked automatically by the client
+ library</emphasis>. It must be called explicitly to avoid a
+ memory leak.
+ </para>
+
+ <para>
<emphasis role="bold">Return Values</emphasis>
</para>
<para>
- Zero if successful. Non-zero if an error occurred.
+ None.
</para>
</section>
- <section id="mysql-thread-end">
+ <section id="mysql-thread-init">
- <title><literal>mysql_thread_end()</literal></title>
+ <title><literal>mysql_thread_init()</literal></title>
<indexterm>
- <primary><literal>mysql_thread_end()</literal></primary>
+ <primary><literal>mysql_thread_init()</literal></primary>
</indexterm>
<para>
- <literal>void mysql_thread_end(void)</literal>
+ <literal>my_bool mysql_thread_init(void)</literal>
</para>
<para>
@@ -12978,24 +12977,25 @@
</para>
<para>
- This function needs to be called before calling
- <literal>pthread_exit()</literal> to free memory allocated by
- <literal>mysql_thread_init()</literal>.
+ This function must be called early within each created thread to
+ initialize thread-specific variables. However, you may not
+ necessarily need to invoke it explicitly:
+ <literal>mysql_thread_init()</literal> is automatically called
+ 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>. If you invoke any of those
+ functions, <literal>mysql_thread_init()</literal> will be called
+ for you.
</para>
<para>
- Note that this <literal>mysql_thread_end()</literal>
- <emphasis>is not invoked automatically by the client
- library</emphasis>. It must be called explicitly to avoid a
- memory leak.
- </para>
-
- <para>
<emphasis role="bold">Return Values</emphasis>
</para>
<para>
- None.
+ Zero if successful. Non-zero if an error occurred.
</para>
</section>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8007 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2 | paul | 6 Oct |
