diff --git a/reference/mysqli/WARNING.txt b/reference/mysqli/WARNING.txt
deleted file mode 100644
index 5a20bfafc0..0000000000
--- a/reference/mysqli/WARNING.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-The current documentation for ext/mysqli is outdated. I made a lot of
-changes (new properties and methods, renamed some functions etc).
-I will fix the current documentation until end of January 2004. Please
-don't make any changes in the current english documentation or start
-translation until things are fixed.
-
-Thanks
-
-Georg Richter
-georg@php.net
diff --git a/reference/mysqli/constants.xml b/reference/mysqli/constants.xml
index 74fcb58cd4..d67a378c93 100644
--- a/reference/mysqli/constants.xml
+++ b/reference/mysqli/constants.xml
@@ -17,7 +17,8 @@
MYSQLI_READ_DEFAULT_GROUP
(integer)
-
+
+ Read options from the named group from `my.cnf' or the file specified with MYSQLI_READ_DEFAULT_FILE
@@ -26,6 +27,7 @@
(integer)
+ Read options from the named option file instead of from my.cnf
@@ -34,6 +36,7 @@
(integer)
+ Connect timeout in seconds
@@ -42,6 +45,7 @@
(integer)
+ Enables command LOAD LOCAL INFILE
@@ -50,6 +54,7 @@
(integer)
+ Command to execute when connecting to MySQL server. Will automatically be re-executed when reconnecting.
@@ -58,6 +63,8 @@
(integer)
+ Use SSL (encrypted protocol). This option should not be set by application programs;
+ it is set internally in the MySQL client library
@@ -66,6 +73,7 @@
(integer)
+ Use compression protocol
@@ -74,6 +82,7 @@
(integer)
+ Allow interactive_timeout seconds (instead of wait_timeout seconds) of inactivity before closing the connection. The client's session wait_timeout variable will be set to the value of the session interactive_timeout variable.
@@ -82,6 +91,7 @@
(integer)
+ Allow spaces after function names. Makes all functions names reserved words.
@@ -90,6 +100,7 @@
(integer)
+ Don't allow the db_name.tbl_name.col_name syntax.
@@ -106,6 +117,7 @@
(integer)
+ For using buffered resultsets
@@ -114,6 +126,7 @@
(integer)
+ For using unbuffered resultsets
@@ -122,6 +135,7 @@
(integer)
+ Columns are returned into the array having the fieldname as the array index.
@@ -130,6 +144,7 @@
(integer)
+ Columns are returned into the array having an enumerated index.
@@ -138,6 +153,7 @@
(integer)
+ Columns are returned into the array having both a numerical index and the fieldname as the associative index.
@@ -146,6 +162,7 @@
(integer)
+ Indicates that a field is defined as NOT NULL
@@ -153,147 +170,153 @@
MYSQLI_PRI_KEY_FLAG
(integer)
-
+
+ Field is part of a primary index
+ MYSQLI_UNIQUE_KEY_FLAG
(integer)
-
+
+ Field is part of an unique index.
+ MYSQLI_MULTIPLE_KEY_FLAG
(integer)
-
+
+ Field is part of an index.
+ MYSQLI_BLOB_FLAG
(integer)
-
+ Field is defined as BLOBMYSQLI_UNSIGNED_FLAG
(integer)
-
+ Field is defined as UNSIGNEDMYSQLI_ZEROFILL_FLAG
(integer)
-
+ Field is defined as ZEROFILLMYSQLI_AUTO_INCREMENT_FLAG
(integer)
-
+ Field is defined as AUTO_INCREMENTMYSQLI_TIMESTAMP_FLAG
(integer)
-
+ Field is defined as TIMESTAMPMYSQLI_SET_FLAG
(integer)
-
+ Field is defined as SETMYSQLI_NUM_FLAG
(integer)
-
+ Field is defined as NUMERICMYSQLI_PART_KEY_FLAG
(integer)
-
+ Field is part of an multi-indexMYSQLI_GROUP_FLAG
(integer)
-
+ Field is part of GROUP BYMYSQLI_TYPE_DECIMAL
(integer)
-
+ Field is defined as DECIMALMYSQLI_TYPE_TINY
(integer)
-
+ Field is defined as TINYINTMYSQLI_TYPE_SHORT
(integer)
-
+ Field is defined as INTMYSQLI_TYPE_LONG
(integer)
-
+ Field is defined as MEDIUMINT
- MYSQLI_TYPE_FLOAD
+ MYSQLI_TYPE_FLOAT
(integer)
-
+ Field is defined as FLOATMYSQLI_TYPE_DOUBLE
(integer)
-
+ Field is defined as doubleMYSQLI_TYPE_NULL
(integer)
-
+ Field is defined as DEFAULT NULLMYSQLI_TYPE_TIMESTAMP
(integer)
-
+ Field is defined as TIMESTAMPMYSQLI_TYPE_LONGLONG
(integer)
-
+ Field is defined as BIGINT
@@ -307,196 +330,140 @@
MYSQLI_TYPE_DATE
(integer)
-
+ Field is defined as DATEMYSQLI_TYPE_TIME
(integer)
-
+ Field is defined as TIMEMYSQLI_TYPE_DATETIME
(integer)
-
+ Field is defined as DATETIMEMYSQLI_TYPE_YEAR
(integer)
-
+ Field is defined as YEARMYSQLI_TYPE_NEWDATE
(integer)
-
+ Field is defined as DATEMYSQLI_TYPE_ENUM
(integer)
-
+ Field is defined as ENUMMYSQLI_TYPE_SET
(integer)
-
+ Field is defined as SETMYSQLI_TYPE_TINY_BLOB
(integer)
-
+ Field is defined as TINYBLOBMYSQLI_TYPE_MEDIUM_BLOB
(integer)
-
+ Field is defined as MEDIUMBLOBMYSQLI_TYPE_LONG_BLOB
(integer)
-
+ Field is defined as LONGBLOBMYSQLI_TYPE_BLOB
(integer)
-
-
-
-
- MYSQLI_TYPE_VAR_STRING
- (integer)
-
-
+ Field is defined as BLOBMYSQLI_TYPE_STRING
(integer)
-
+ Field is defined as VARCHARMYSQLI_TYPE_CHAR
(integer)
-
-
-
-
- MYSQLI_TYPE_INTERVAL
- (integer)
-
-
+ Field is defined as CHARMYSQLI_TYPE_GEOMETRY
(integer)
-
+ Field is defined as GEOMETRYMYSQLI_BIND_STRING
(integer)
-
+ Bind variable has type STRINGMYSQLI_BIND_INT
(integer)
-
+ Bind variable has type INTMYSQLI_BIND_DOUBLE
(integer)
-
+ Bind variable has type DOUBLEMYSQLI_BIND_SEND_DATA
(integer)
-
-
-
-
- MYSQLI_RPL_MASTER
- (integer)
-
-
-
-
-
- MYSQLI_RPL_SLAVE
- (integer)
-
-
-
-
-
- MYSQLI_RPL_ADMIN
- (integer)
-
-
+ Sending bind variable in chunksMYSQLI_NEED_DATA
(integer)
-
+ More data available for bind variableMYSQLI_NO_DATA
(integer)
-
-
-
-
- MYSQLI_PR_REPORT_STDERR
- (integer)
-
-
-
-
-
- MYSQLI_PR_REPORT_PORT
- (integer)
-
-
-
-
-
- MYSQLI_PR_REPORT_FILE
- (integer)
-
-
+ No more data available for bind variable
diff --git a/reference/mysqli/reference.xml b/reference/mysqli/reference.xml
index e96f2fdeff..8186ded5b1 100644
--- a/reference/mysqli/reference.xml
+++ b/reference/mysqli/reference.xml
@@ -1,5 +1,5 @@
-
+
Improved MySQL Extensionmysqli
@@ -16,9 +16,7 @@
Documentation for MySQL can be found at &url.mysql.docs;.
-
- &warn.experimental;
-
+ Parts of this documentation included from MySQL manual with permissions of MySQL AB.
@@ -29,7 +27,7 @@
- The mysqli extension is designed to work with the version 4.1 or above
+ The mysqli extension is designed to work with the version 4.1.2 or above
of MySQL. For previous versions, please see the MySQL extension documentation.
@@ -39,28 +37,280 @@
&reference.mysqli.configure;
&reference.mysqli.ini;
-
- &reftitle.resources;
+
+ &reftitle.classes
-
- <literal>mysqli_link</literal>
+
+ <classname>mysqli</classname>
Represents a connection between PHP and a MySQL database.
+
+ &reftitle.constructor
+
+
+ mysqli() - construct a new mysqli object
+
+
+
+
+ &reftitle.methods
+
+
+ autocommit() - turns on or off auto-commiting database modifications
+
+
+ change_user() - changes the user of the specified database connection
+
+
+ character_set_name - returns the default character set for the database connection
+
+
+ close - closes a previously opened connection
+
+
+ commit - commits the current transaction
+
+
+ connect - opens a new connection to MySQL database server
+
+
+ debug - performs debugging operations
+
+
+ dump_debug_info - dumps debug information
+
+
+ get_client_info - returns client version
+
+
+ get_host_info - returns type of connection used
+
+
+ get_server_info - returns version of the MySQL server
+
+
+ init - initializes mysqli object
+
+
+ info - retrieves information about the most recently executed query
+
+
+ kill - asks the server to kill a mysql thread
+
+
+ multi_query - performs multiple queries
+
+
+ more_results - checks if more results exists from currently executed multi-query
+
+
+ next_result - reads next result from currently executed multi-query
+
+
+ options - set options
+
+
+ ping - pings a server connection or reconnects if there is no connection
+
+
+ prepare - prepares a SQL query
+
+
+ query - performs a query
+
+
+ real_connect - attempts to open a connection to MySQL database server
+
+
+ escape_string - Escapes special characters in a string for use in a SQL statement, taking into account the current charset of the connection
+
+
+ rollback - rolls back the current transaction
+
+
+ select_db - selects the default database
+
+
+ set_opt - sets options
+
+
+ ssl_set - sets ssl parameters
+
+
+ stat - gets the current system status
+
+
+ store_result - transfers a resultset from last query
+
+
+ use_result - transfers an unbuffered resultset from last query
+
+
+ thread-safe - returns whether thread safety is given or not
+
+
+
+
+ &reftitle.properties
+
+
+ affected_rows - gets the number of affected rows in a previous MySQL operation
+
+
+ errno - returns the error code for the most recent function call
+
+
+ error - returns the error string for the most recent function call
+
+
+ field_count - returns the number of columns for the most recent query
+
+
+ host_info - returns a string representing the type of connection used
+
+
+ info - retrieves information about the most recently executed query
+
+
+ insert-id - returns the auto generated id used in the last query
+
+
+ protocol_version - returns the version of the MySQL protocol used
+
+
+ sqlstate - returns a string containing the SQLSTATE error code for the last error
+
+
+ thread_id - returns the thread ID for the current connection
+
+
+ warning-count - returns the number of warnings generated during execution of the previous SQL statement
+
+
+
+
-
- <literal>mysqli_stmt</literal>
+
+ <classname>stmt</classname>
Represents a prepared statement.
+
+ &reftitle.methods
+
+
+ bind_param - Binds variables to a prepared statement
+
+
+ bind_result - Binds variables to a prepared statement for result storage
+
+
+ close - Closes a prepared statement
+
+
+ data-seek - Seeks to an arbitrary row in a statement result set
+
+
+ execute - Executes a prepared statement
+
+
+ fetch - Fetches result from a prepared statement into bound variables
+
+
+ get_metadata - Retrieves a resultset from a prepared statement for metadata information
+
+
+ send_long_data - Sends data in chunks
+
+
+ store_result - Buffers complete resultset from a prepared statement
+
+
+
+
+ &reftitle.properties
+
+
+ affected_rows - Returns affected rows from last statement execution
+
+
+ field_count - Returns number of fields for a given prepared statement
+
+
+ errno - Returns errorcode for last statement function
+
+
+ errno - Returns errormessage for last statement function
+
+
+ param_count - Returns number of parameter for a given prepare statement
+
+
+ sqlstate - returns a string containing the SQLSTATE error code for the last statement function
+
+
+
-
- <literal>mysqli_result</literal>
+
+ <classname>result</classname>
Represents the result set obtained from a query against the database.
+
+ &reftitle.methods
+
+
+ close - closes resultset
+
+
+ data_seek - moves internal result pointer
+
+
+ fetch_field - gets column information from a resultset
+
+
+ fetch_fields - gets information for all columns from a resulset
+
+
+ fetch_field_direct - gets column information for specified column
+
+
+ fetch_array - fetches a result row as an associative array, a numeric array, or both.
+
+
+ fetch_assoc - fetches a result row as an associative array
+
+
+ fetch_object - fetches a result row as an object
+
+
+ fetch_row - gets a result row as an enumerated array
+
+
+ close - frees result memory
+
+
+ field_seek - set result pointer to a specified field offset
+
+
+
+
+ &reftitle.properties
+
+
+ current_field - returns offset of current fieldpointer
+
+
+ field_count - returns number of fields in resultset
+
+
+ num_rows - returns number of rows in resultset
+
+
+
@@ -68,8 +318,7 @@
-&reference.mysqli.functions;
-
+ &reference.mysqli.functions;