summaryrefslogtreecommitdiff
path: root/plugin/handler_socket
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-03-21 13:02:53 +0100
committerSergei Golubchik <serg@mariadb.org>2016-03-21 13:02:53 +0100
commit3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch)
tree39cefed54f79f93f82e9c33a4e094270103bf137 /plugin/handler_socket
parente7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff)
parent22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff)
downloadmariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'plugin/handler_socket')
-rw-r--r--plugin/handler_socket/docs-en/perl-client.en.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugin/handler_socket/docs-en/perl-client.en.txt b/plugin/handler_socket/docs-en/perl-client.en.txt
index 448d33b5f12..cc9138518ee 100644
--- a/plugin/handler_socket/docs-en/perl-client.en.txt
+++ b/plugin/handler_socket/docs-en/perl-client.en.txt
@@ -42,7 +42,7 @@ to be retrieved are specified by the 5th argument for the
corresponding open_index call.
The execute_single method always returns an arrayref. The first
-element is the error code, which is 0 when no error is occured.
+element is the error code, which is 0 when no error is occurred.
The remaining are the field values. If more than one record is
returned, it is flatten to an 1-dimensional array. For example,
when 5 records that have 3 columns are returned, you can retrieve
@@ -125,9 +125,9 @@ methods.
die $hs->get_error() if $res->[0] != 0;
-----------------------------------------------------------------
-When an error is occured, the first element of the returned
+When an error is occurred, the first element of the returned
arrayref becomes a non-zero value. A negative value indicates
-that an I/O error is occured and the Net::HandlerSocket object
+that an I/O error is occurred and the Net::HandlerSocket object
should be disposed. A positive value means that the connection is
still active and the Net::HandlerSocket object can be reused
later.