Author: paul
Date: 2007-10-05 21:15:49 +0200 (Fri, 05 Oct 2007)
New Revision: 7975
Log:
r30702@polar: paul | 2007-10-05 14:15:10 -0500
Mark up the libmysqld section.
Modified:
trunk/refman-5.2/apis-libmysqld.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30700
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25316
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:30702
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25316
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/refman-5.2/apis-libmysqld.xml
===================================================================
--- trunk/refman-5.2/apis-libmysqld.xml 2007-10-05 17:23:25 UTC (rev 7974)
+++ trunk/refman-5.2/apis-libmysqld.xml 2007-10-05 19:15:49 UTC (rev 7975)
Changed blocks: 3, Lines Added: 16, Lines Deleted: 15; 3378 bytes
@@ -52,21 +52,21 @@
<entry><emphasis role="bold">When to Call</emphasis></entry>
</row>
<row>
- <entry><literal>mysql_library_init()</literal></entry>
+ <entry><function role="capi">mysql_library_init()</function></entry>
<entry>Should be called before any other MySQL function is called, preferably
- early in the <literal>main()</literal> function.</entry>
+ early in the <function>main()</function> function.</entry>
</row>
<row>
- <entry><literal>mysql_library_end()</literal></entry>
+ <entry><function role="capi">mysql_library_end()</function></entry>
<entry>Should be called before your program exits.</entry>
</row>
<row>
- <entry><literal>mysql_thread_init()</literal></entry>
+ <entry><function role="capi">mysql_thread_init()</function></entry>
<entry>Should be called in each thread you create that accesses MySQL.</entry>
</row>
<row>
- <entry><literal>mysql_thread_end()</literal></entry>
- <entry>Should be called before calling <literal>pthread_exit()</literal></entry>
+ <entry><function role="capi">mysql_thread_end()</function></entry>
+ <entry>Should be called before calling <function>pthread_exit()</function></entry>
</row>
</tbody>
</tgroup>
@@ -85,7 +85,7 @@
<para>
The
- <literal>mysql_library_<replaceable>xxx</replaceable>()</literal>
+ <function>mysql_library_<replaceable>xxx</replaceable>()</function>
functions are also included in
<filename>libmysqlclient.a</filename> to allow you to change
between the embedded and the client/server version by just linking
@@ -267,14 +267,15 @@
Any options that may be given with the <command>mysqld</command>
server daemon, may be used with an embedded server library. Server
options may be given in an array as an argument to the
- <literal>mysql_library_init()</literal>, which initializes the
- server. They also may be given in an option file like
- <filename>my.cnf</filename>. To specify an option file for a C
- program, use the <option>--defaults-file</option> option as one of
- the elements of the second argument of the
- <literal>mysql_library_init()</literal> function. See
- <xref linkend="mysql-library-init"/>, for more information on the
- <literal>mysql_library_init()</literal> function.
+ <function role="capi">mysql_library_init()</function>, which
+ initializes the server. They also may be given in an option file
+ like <filename>my.cnf</filename>. To specify an option file for a
+ C program, use the <option>--defaults-file</option> option as one
+ of the elements of the second argument of the
+ <function role="capi">mysql_library_init()</function> function.
+ See <xref linkend="mysql-library-init"/>, for more information on
+ the <function role="capi">mysql_library_init()</function>
+ function.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7975 - in trunk: . refman-5.2 | paul | 5 Oct |
