Author: paul
Date: 2006-04-07 16:44:33 +0200 (Fri, 07 Apr 2006)
New Revision: 1758
Log:
r9296@frost: paul | 2006-04-07 09:16:49 -0500
--defaults-extra-file with non-existent file causes program
to exit with error as of 5.0.6.
Modified:
trunk/
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/using-mysql-programs.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/using-mysql-programs.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9272
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4334
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9296
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4334
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-04-07 14:05:07 UTC (rev 1757)
+++ trunk/refman-5.0/database-administration.xml 2006-04-07 14:44:33 UTC (rev 1758)
@@ -11015,7 +11015,9 @@
<para>
The name of an option file to be read in addition to the
usual option files. This must be the first option on the
- command line if it is used.
+ command line if it is used. As of MySQL 5.0.6, if the
+ file does not exist or is otherwise inaccessible, the
+ server will exit with an error.
</para>
</listitem>
@@ -12459,12 +12461,14 @@
</programlisting>
<note>
+
<para>
The Instance Manager must be restarted after
adding/changing passwords.
</para>
+
</note>
-
+
</refsection>
<refsection id="instance-manager-security-monitoring">
@@ -14048,24 +14052,22 @@
<listitem>
<para>
- PHP: Use the
+ PHP: Use the
<function>mysql_real_escape_string()</function> function
- (available as of PHP 4.3.0, prior to that PHP version use
- <function>mysql_escape_string()</function>, and prior to
- PHP 4.0.3, use <function>addslashes()</function> ).
- Note that only
+ (available as of PHP 4.3.0, prior to that PHP version
+ use <function>mysql_escape_string()</function>, and
+ prior to PHP 4.0.3, use
+ <function>addslashes()</function> ). Note that only
<function>mysql_real_escape_string()</function> is
character set-aware; the other functions can be
<quote>bypassed</quote> when using (invalid) multi-byte
- character sets.
- In PHP 5, you
- can use the <literal>mysqli</literal> extension, which
- supports the improved MySQL authentication protocol and
- passwords, as well as prepared statements with
- placeholders.
+ character sets. In PHP 5, you can use the
+ <literal>mysqli</literal> extension, which supports the
+ improved MySQL authentication protocol and passwords, as
+ well as prepared statements with placeholders.
</para>
</listitem>
-
+
<listitem>
<para>
Perl DBI: Use placeholders or the
Modified: trunk/refman-5.0/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.0/using-mysql-programs.xml 2006-04-07 14:05:07 UTC (rev 1757)
+++ trunk/refman-5.0/using-mysql-programs.xml 2006-04-07 14:44:33 UTC (rev 1758)
@@ -1195,6 +1195,10 @@
<listitem>
<para>
+ <indexterm>
+ <primary>no-defaults option</primary>
+ </indexterm>
+
<option>--no-defaults</option>
</para>
@@ -1205,6 +1209,10 @@
<listitem>
<para>
+ <indexterm>
+ <primary>print-defaults option</primary>
+ </indexterm>
+
<option>--print-defaults</option>
</para>
@@ -1216,6 +1224,10 @@
<listitem>
<para>
+ <indexterm>
+ <primary>defaults-file option</primary>
+ </indexterm>
+
<option>--defaults-file=<replaceable>file_name</replaceable></option>
</para>
@@ -1228,6 +1240,10 @@
<listitem>
<para>
+ <indexterm>
+ <primary>defaults-extra-file option</primary>
+ </indexterm>
+
<option>--defaults-extra-file=<replaceable>file_name</replaceable></option>
</para>
@@ -1235,7 +1251,9 @@
Read this option file after the global option file but (on
Unix) before the user option file.
<replaceable>file_name</replaceable> is the full pathname to
- the file.
+ the file. As of MySQL 5.0.6, if the file does not exist or
+ is otherwise inaccessible, the program will exit with an
+ error.
</para>
</listitem>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-04-07 14:05:07 UTC (rev 1757)
+++ trunk/refman-5.1/database-administration.xml 2006-04-07 14:44:33 UTC (rev 1758)
@@ -10919,7 +10919,9 @@
<para>
The name of an option file to be read in addition to the
usual option files. This must be the first option on the
- command line if it is used.
+ command line if it is used. If the file does not exist
+ or is otherwise inaccessible, the server will exit with
+ an error.
</para>
</listitem>
@@ -12355,13 +12357,15 @@
mike:*00A51F3F48415C7D4E8908980D443C29C69B60C9
</programlisting>
- <note>
+ <note>
+
<para>
The Instance Manager must be restarted after
adding/changing passwords.
</para>
+
</note>
-
+
</refsection>
<refsection id="instance-manager-security-monitoring">
@@ -12952,7 +12956,7 @@
<title>&title-instance-manager-commands;</title>
- <para>
+ <para>
Once you've set up a password file for the MySQL Instance
Manager and the IM is running, you can connect to it. You can
use the <command>mysql</command> client tool connect through a
@@ -13938,21 +13942,19 @@
<listitem>
<para>
- PHP: Use the
+ PHP: Use the
<function>mysql_real_escape_string()</function> function
- (available as of PHP 4.3.0, prior to that PHP version use
- <function>mysql_escape_string()</function>, and prior to
- PHP 4.0.3, use <function>addslashes()</function> ).
- Note that only
+ (available as of PHP 4.3.0, prior to that PHP version
+ use <function>mysql_escape_string()</function>, and
+ prior to PHP 4.0.3, use
+ <function>addslashes()</function> ). Note that only
<function>mysql_real_escape_string()</function> is
character set-aware; the other functions can be
<quote>bypassed</quote> when using (invalid) multi-byte
- character sets.
- In PHP 5, you
- can use the <literal>mysqli</literal> extension, which
- supports the improved MySQL authentication protocol and
- passwords, as well as prepared statements with
- placeholders.
+ character sets. In PHP 5, you can use the
+ <literal>mysqli</literal> extension, which supports the
+ improved MySQL authentication protocol and passwords, as
+ well as prepared statements with placeholders.
</para>
</listitem>
Modified: trunk/refman-5.1/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.1/using-mysql-programs.xml 2006-04-07 14:05:07 UTC (rev 1757)
+++ trunk/refman-5.1/using-mysql-programs.xml 2006-04-07 14:44:33 UTC (rev 1758)
@@ -1193,6 +1193,10 @@
<listitem>
<para>
+ <indexterm>
+ <primary>no-defaults option</primary>
+ </indexterm>
+
<option>--no-defaults</option>
</para>
@@ -1203,6 +1207,10 @@
<listitem>
<para>
+ <indexterm>
+ <primary>print-defaults option</primary>
+ </indexterm>
+
<option>--print-defaults</option>
</para>
@@ -1214,6 +1222,10 @@
<listitem>
<para>
+ <indexterm>
+ <primary>defaults-file option</primary>
+ </indexterm>
+
<option>--defaults-file=<replaceable>file_name</replaceable></option>
</para>
@@ -1226,6 +1238,10 @@
<listitem>
<para>
+ <indexterm>
+ <primary>defaults-extra-file option</primary>
+ </indexterm>
+
<option>--defaults-extra-file=<replaceable>file_name</replaceable></option>
</para>
@@ -1233,7 +1249,8 @@
Read this option file after the global option file but (on
Unix) before the user option file.
<replaceable>file_name</replaceable> is the full pathname to
- the file.
+ the file. If the file does not exist or is otherwise
+ inaccessible, the program will exit with an error.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1758 - in trunk: . refman-5.0 refman-5.1 | paul | 7 Apr |
