From 52e87979a023d0ae767fc861b3f5f1b91c2f1c72 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@php.net>
Date: Fri, 20 Feb 2004 11:10:11 +0000
Subject: [PATCH] fixed bugs in mysql_connect_err* added sample for
 mysqli_connect

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@151911 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../mysqli/functions/mysqli-connect-errno.xml | 22 ++++-----
 .../mysqli/functions/mysqli-connect-error.xml | 22 ++++-----
 reference/mysqli/functions/mysqli-connect.xml | 49 ++++++++++---------
 3 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/reference/mysqli/functions/mysqli-connect-errno.xml b/reference/mysqli/functions/mysqli-connect-errno.xml
index cbbcd47a51..9b059e244f 100644
--- a/reference/mysqli/functions/mysqli-connect-errno.xml
+++ b/reference/mysqli/functions/mysqli-connect-errno.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.mysqli-connect-errno">
    <refnamediv>
     <refname>mysqli_connect_errno</refname>
@@ -32,6 +32,16 @@
      zero means no error occurred.
     </para>
    </refsect1>
+   <refsect1>
+    <title>See also</title>
+    <para>
+     <function>mysqli_connect</function>,
+     <function>mysqli_connect_error</function>,
+     <function>mysqli_errno</function>,
+     <function>mysqli_error</function>,
+     <function>mysqli_sqlstate</function>
+    </para>
+   </refsect1>
    <refsect1>
     <title>Example</title>
     <para>
@@ -52,16 +62,6 @@ if (!$link) {
      </example>
     </para>
    </refsect1>
-   <refsect1>
-    <title>See also</title>
-    <para>
-     <function>mysqli_connect</function>,
-     <function>mysqli_connect_error</function>,
-     <function>mysqli_errno</function>,
-     <function>mysqli_error</function>,
-     <function>mysqli_sqlstate</function>
-    </para>
-   </refsect1>
   </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/mysqli/functions/mysqli-connect-error.xml b/reference/mysqli/functions/mysqli-connect-error.xml
index 2e18ba1dc7..70a8dc01c1 100644
--- a/reference/mysqli/functions/mysqli-connect-error.xml
+++ b/reference/mysqli/functions/mysqli-connect-error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.mysqli-connect-error">
    <refnamediv>
     <refname>mysqli_connect_error</refname>
@@ -26,6 +26,16 @@
       A string that describes the error. An empty string if no error occurred. 
     </para>
    </refsect1>
+   <refsect1>
+    <title>See also</title>
+    <para>
+     <function>mysqli_connect</function>,
+     <function>mysqli_connect_errno</function>,
+     <function>mysqli_errno</function>,
+     <function>mysqli_error</function>,
+     <function>mysqli_sqlstate</function>
+    </para>
+   </refsect1>
    <refsect1>
     <title>Example</title>
     <para>
@@ -46,16 +56,6 @@ if (!$link) {
      </example>
     </para>
    </refsect1>
-   <refsect1>
-    <title>See also</title>
-    <para>
-     <function>mysqli_connect</function>,
-     <function>mysqli_connect_errno</function>,
-     <function>mysqli_errno</function>,
-     <function>mysqli_error</function>,
-     <function>mysqli_sqlstate</function>
-    </para>
-   </refsect1>
   </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/mysqli/functions/mysqli-connect.xml b/reference/mysqli/functions/mysqli-connect.xml
index 36e2f2345d..393a1f5da2 100644
--- a/reference/mysqli/functions/mysqli-connect.xml
+++ b/reference/mysqli/functions/mysqli-connect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
   <refentry id="function.mysqli-connect">
    <refnamediv>
     <refname>mysqli_connect</refname>
@@ -75,38 +75,39 @@
     <title>Example</title>
     <para>
      <example>
-      <title>Using the mysqli_connect function</title>
+      <title>Object oriented style</title>
       <programlisting role="php">
 <![CDATA[
 <?php
 /*
-  +-----------------------------------------------------------+
-  | file: mysqli_connect.php                                  |
-  +-----------------------------------------------------------+
-  | connects to MySQL server on localhost and prints host     |
-  | information                                               |
-  +-----------------------------------------------------------+
-*/
-   
-   /* ---- Procedural style ---- */
-   $link = mysqli_connect("localhost", "my_user", "my_password", "test")
-      or die("Can't connect to MySQL server on localhost");
+$mysqli = new mysqli("localhost", "my_user", "my_password", "test");
 
-   printf("Host information: %s\n", mysqli_get_host_info($link));
+if (mysqli_connect_errno()) {
+    printf("Connect failed: %s\n", mysqli_connect_error());
+    exit();
+}
 
-   mysqli_close($link);
+printf("Host information: %s\n", $mysqli->host_info);
 
-   /* ---- Object oriented style ----*/
-   $mysqli = new mysqli("localhost", "my_user", "my_password", "test");
+/* close connection */
+$mysqli->close();
+?>                       
+]]>
+      </programlisting>
+     </example>
+     <example>
+      <title>Procedural style</title>
+      <programlisting role="php">
+<![CDATA[
+<?php
+/*
+$link = mysqli_connect("localhost", "my_user", "my_password", "test")
+   or die("Can't connect to MySQL server on localhost");
 
-   if (mysqli_connect_errno()) {
-      printf("Connect failed: %s\n", mysqli_connect_error());
-      exit();
-   }
+printf("Host information: %s\n", mysqli_get_host_info($link));
 
-   printf("Host information: %s\n", $mysqli->host_info);
-
-   $mysqli->close();
+/* close connection */
+mysqli_close($link);
 ?>                       
 ]]>
       </programlisting>