diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
| commit | 38194bf7a5d4927f8adeddc5e00bf4feab08114f (patch) | |
| tree | b33dfb00e00ec3f4473c088305871021f437ee46 /libmysql/errmsg.c | |
| parent | 623ed1946215e25682847ac3b0ea066cab35ea59 (diff) | |
| parent | 052c9e392e6d9b770511c88cfec05ef606bff2ed (diff) | |
| download | mariadb-git-38194bf7a5d4927f8adeddc5e00bf4feab08114f.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime.
Diffstat (limited to 'libmysql/errmsg.c')
| -rw-r--r-- | libmysql/errmsg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index febbded6af2..823f83026c9 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -84,7 +84,8 @@ const char *client_errors[]= "Lost connection to MySQL server at '%s', system error: %d", "Statement closed indirectly because of a preceeding %s() call", "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again", - "This handle is already connected. Use a separate handle for each connection." + "This handle is already connected. Use a separate handle for each connection.", + "Authentication plugin '%s' cannot be loaded: %s", "" }; |