summaryrefslogtreecommitdiff
path: root/extlib/DB/mysql.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-08 23:27:24 +0100
committerBrion Vibber <brion@pobox.com>2009-11-08 23:27:24 +0100
commitec6a38a62786c85e8ee30c5726ea81f82465b39d (patch)
tree31bb66f24f8fb4de55d9f6a21728278fcac804a1 /extlib/DB/mysql.php
parentc7961fe6dc033d1d40ab7d7f9bb994492ae4ea7b (diff)
parent104a47e4a2903f1c7ea73363a73cee12f0cf14ac (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'extlib/DB/mysql.php')
-rw-r--r--extlib/DB/mysql.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/extlib/DB/mysql.php b/extlib/DB/mysql.php
index c67254520..bfe34dbe8 100644
--- a/extlib/DB/mysql.php
+++ b/extlib/DB/mysql.php
@@ -139,7 +139,7 @@ class DB_mysql extends DB_common
/**
* The quantity of transactions begun
*
- * {@internal While this is private, it can't actually be designated
+ * {@internal While this is private, it cannot actually be designated
* private in PHP 5 because it is directly accessed in the test suite.}}
*
* @var integer
@@ -359,7 +359,7 @@ class DB_mysql extends DB_common
* See DB_result::fetchInto() for more information.
*
* This method is not meant to be called directly. Use
- * DB_result::fetchInto() instead. It can't be declared "protected"
+ * DB_result::fetchInto() instead. It cannot be declared "protected"
* because DB_result is a separate object.
*
* @param resource $result the query result resource
@@ -411,7 +411,7 @@ class DB_mysql extends DB_common
* Deletes the result set and frees the memory occupied by the result set
*
* This method is not meant to be called directly. Use
- * DB_result::free() instead. It can't be declared "protected"
+ * DB_result::free() instead. It cannot be declared "protected"
* because DB_result is a separate object.
*
* @param resource $result PHP's query result resource
@@ -432,7 +432,7 @@ class DB_mysql extends DB_common
* Gets the number of columns in a result set
*
* This method is not meant to be called directly. Use
- * DB_result::numCols() instead. It can't be declared "protected"
+ * DB_result::numCols() instead. It cannot be declared "protected"
* because DB_result is a separate object.
*
* @param resource $result PHP's query result resource
@@ -457,7 +457,7 @@ class DB_mysql extends DB_common
* Gets the number of rows in a result set
*
* This method is not meant to be called directly. Use
- * DB_result::numRows() instead. It can't be declared "protected"
+ * DB_result::numRows() instead. It cannot be declared "protected"
* because DB_result is a separate object.
*
* @param resource $result PHP's query result resource
@@ -722,7 +722,7 @@ class DB_mysql extends DB_common
return $result;
}
if ($result == 0) {
- // Failed to get the lock, can't do the conversion, bail
+ // Failed to get the lock, cannot do the conversion, bail
// with a DB_ERROR_NOT_LOCKED error
return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
}
@@ -757,7 +757,7 @@ class DB_mysql extends DB_common
* Quotes a string so it can be safely used as a table or column name
* (WARNING: using names that require this is a REALLY BAD IDEA)
*
- * WARNING: Older versions of MySQL can't handle the backtick
+ * WARNING: Older versions of MySQL cannot handle the backtick
* character (<kbd>`</kbd>) in table or column names.
*
* @param string $str identifier name to be quoted