| List: | Internals | « Previous MessageNext Message » | |
| From: | paul | Date: | July 15 2005 5:41pm |
| Subject: | bk commit - mysqldoc@docsrva tree (paul:1.3034) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local mysqldoc repository of paul. When paul 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.3034 05/07/15 10:41:23 paul@stripped +3 -0 Add missing mysql_option() options. refman/mysql-apis.xml 1.8 05/07/15 10:41:21 paul@stripped +80 -0 Add missing mysql_option() options. refman-5.0/mysql-apis.xml 1.8 05/07/15 10:41:20 paul@stripped +80 -0 Sync. refman-4.1/mysql-apis.xml 1.8 05/07/15 10:41:20 paul@stripped +80 -0 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: paul # Host: frost.snake.net # Root: /Volumes/frost2/MySQL/bk/mysqldoc --- 1.7/refman-4.1/mysql-apis.xml 2005-07-14 15:11:31 -05:00 +++ 1.8/refman-4.1/mysql-apis.xml 2005-07-15 10:41:20 -05:00 @@ -4849,6 +4849,27 @@ </row> <row> <entry> + <literal>MYSQL_OPT_GUESS_CONNECTION</literal> + </entry> + <entry> + Not used + </entry> + <entry> + For an application linked against + <literal>libmysqld</literal>, this allows the library to + guess whether to use the embedded server or a remote + server. <quote>Guess</quote> means that if the hostname is + set and is not <literal>localhost</literal>, it uses a + remote server. This behavior is the default. + <literal>MYSQL_OPT_USE_EMBEDDED_CONNECTION</literal> and + <literal>MYSQL_OPT_USE_REMOTE_CONNECTION</literal> can be + used to override it. This option is ignored for + applications linked against + <literal>libmysqlclient</literal>. New in 4.1.1. + </entry> + </row> + <row> + <entry> <literal>MYSQL_OPT_LOCAL_INFILE</literal> </entry> <entry> @@ -4894,6 +4915,65 @@ <entry> Timeout for reads from server (works currently only on Windows on TCP/IP connections). New in 4.1.1. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_SET_CLIENT_IP</literal> + </entry> + <entry> + <literal>char *</literal> + </entry> + <entry> + For an application linked against linked against + <literal>libmysqld</literal> (with + <literal>libmysqld</literal> compiled with authentication + support), this means that the user is considered to have + connected from the specified IP address (specified as a + string) for authentication purposes. This option is ignored + for applications linked against + <literal>libmysqlclient</literal>. New in 4.1.1. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_USE_EMBEDDED_CONNECTION</literal> + </entry> + <entry> + Not used + </entry> + <entry> + For an application linked against + <literal>libmysqld</literal>, this forces the use of the + embedded server for the connection. This option is ignored + for applications linked against + <literal>libmysqlclient</literal>. New in 4.1.1. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_USE_REMOTE_CONNECTION</literal> + </entry> + <entry> + Not used + </entry> + <entry> + For an application linked against + <literal>libmysqld</literal>, this forces the use of a + remote server for the connection. This option is ignored + for applications linked against + <literal>libmysqlclient</literal>. New in 4.1.1. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_USE_RESULT</literal> + </entry> + <entry> + Not used + </entry> + <entry> + This option is new in 4.1.1, but is unused. </entry> </row> <row> --- 1.7/refman-5.0/mysql-apis.xml 2005-07-14 15:11:32 -05:00 +++ 1.8/refman-5.0/mysql-apis.xml 2005-07-15 10:41:20 -05:00 @@ -4849,6 +4849,27 @@ </row> <row> <entry> + <literal>MYSQL_OPT_GUESS_CONNECTION</literal> + </entry> + <entry> + Not used + </entry> + <entry> + For an application linked against + <literal>libmysqld</literal>, this allows the library to + guess whether to use the embedded server or a remote + server. <quote>Guess</quote> means that if the hostname is + set and is not <literal>localhost</literal>, it uses a + remote server. This behavior is the default. + <literal>MYSQL_OPT_USE_EMBEDDED_CONNECTION</literal> and + <literal>MYSQL_OPT_USE_REMOTE_CONNECTION</literal> can be + used to override it. This option is ignored for + applications linked against + <literal>libmysqlclient</literal>. + </entry> + </row> + <row> + <entry> <literal>MYSQL_OPT_LOCAL_INFILE</literal> </entry> <entry> @@ -4894,6 +4915,65 @@ <entry> Timeout for reads from server (works currently only on Windows on TCP/IP connections). New in 4.1.1. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_SET_CLIENT_IP</literal> + </entry> + <entry> + <literal>char *</literal> + </entry> + <entry> + For an application linked against linked against + <literal>libmysqld</literal> (with + <literal>libmysqld</literal> compiled with authentication + support), this means that the user is considered to have + connected from the specified IP address (specified as a + string) for authentication purposes. This option is ignored + for applications linked against + <literal>libmysqlclient</literal>. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_USE_EMBEDDED_CONNECTION</literal> + </entry> + <entry> + Not used + </entry> + <entry> + For an application linked against + <literal>libmysqld</literal>, this forces the use of the + embedded server for the connection. This option is ignored + for applications linked against + <literal>libmysqlclient</literal>. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_USE_REMOTE_CONNECTION</literal> + </entry> + <entry> + Not used + </entry> + <entry> + For an application linked against + <literal>libmysqld</literal>, this forces the use of a + remote server for the connection. This option is ignored + for applications linked against + <literal>libmysqlclient</literal>. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_USE_RESULT</literal> + </entry> + <entry> + Not used + </entry> + <entry> + This option is new in 4.1.1, but is unused. </entry> </row> <row> --- 1.7/refman/mysql-apis.xml 2005-07-14 15:11:33 -05:00 +++ 1.8/refman/mysql-apis.xml 2005-07-15 10:41:21 -05:00 @@ -4849,6 +4849,27 @@ </row> <row> <entry> + <literal>MYSQL_OPT_GUESS_CONNECTION</literal> + </entry> + <entry> + Not used + </entry> + <entry> + For an application linked against + <literal>libmysqld</literal>, this allows the library to + guess whether to use the embedded server or a remote + server. <quote>Guess</quote> means that if the hostname is + set and is not <literal>localhost</literal>, it uses a + remote server. This behavior is the default. + <literal>MYSQL_OPT_USE_EMBEDDED_CONNECTION</literal> and + <literal>MYSQL_OPT_USE_REMOTE_CONNECTION</literal> can be + used to override it. This option is ignored for + applications linked against + <literal>libmysqlclient</literal>. New in 4.1.1. + </entry> + </row> + <row> + <entry> <literal>MYSQL_OPT_LOCAL_INFILE</literal> </entry> <entry> @@ -4894,6 +4915,65 @@ <entry> Timeout for reads from server (works currently only on Windows on TCP/IP connections). New in 4.1.1. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_SET_CLIENT_IP</literal> + </entry> + <entry> + <literal>char *</literal> + </entry> + <entry> + For an application linked against linked against + <literal>libmysqld</literal> (with + <literal>libmysqld</literal> compiled with authentication + support), this means that the user is considered to have + connected from the specified IP address (specified as a + string) for authentication purposes. This option is ignored + for applications linked against + <literal>libmysqlclient</literal>. New in 4.1.1. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_USE_EMBEDDED_CONNECTION</literal> + </entry> + <entry> + Not used + </entry> + <entry> + For an application linked against + <literal>libmysqld</literal>, this forces the use of the + embedded server for the connection. This option is ignored + for applications linked against + <literal>libmysqlclient</literal>. New in 4.1.1. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_USE_REMOTE_CONNECTION</literal> + </entry> + <entry> + Not used + </entry> + <entry> + For an application linked against + <literal>libmysqld</literal>, this forces the use of a + remote server for the connection. This option is ignored + for applications linked against + <literal>libmysqlclient</literal>. New in 4.1.1. + </entry> + </row> + <row> + <entry> + <literal>MYSQL_OPT_USE_RESULT</literal> + </entry> + <entry> + Not used + </entry> + <entry> + This option is new in 4.1.1, but is unused. </entry> </row> <row>
| Thread | ||
|---|---|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3034) | paul | 15 Jul |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.490 sec. using MySQL 5.1.14-beta-log