summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2013-04-19 16:29:53 +0200
committerAndrey Hristov <andrey@php.net>2013-04-19 16:29:53 +0200
commit7b7424c34cf00f1e0595b9acfaed44f0bd70c7eb (patch)
tree6785a3b30491bed023c9b57d8a6f570386f8b83c
parent0704e4badb3abdfbdd5efc2b6d51c8abd6e5629a (diff)
parent39cc08c7e985a7621d052e3f557c63cf5456fc30 (diff)
downloadphp-git-7b7424c34cf00f1e0595b9acfaed44f0bd70c7eb.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
-rw-r--r--ext/mysqlnd/mysqlnd_enum_n_def.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h
index 1d645a8d75..4ace69adcf 100644
--- a/ext/mysqlnd/mysqlnd_enum_n_def.h
+++ b/ext/mysqlnd/mysqlnd_enum_n_def.h
@@ -43,7 +43,7 @@
#define MYSQLND_SQLSTATE_LENGTH 5
#define MYSQLND_SQLSTATE_NULL "00000"
-#define MYSQLND_MAX_ALLOWED_USER_LEN 256 /* 64 char * 4byte . MySQL supports now only 16 char, but let it be forward compatible */
+#define MYSQLND_MAX_ALLOWED_USER_LEN 252 /* 63 char * 4byte . MySQL supports now only 16 char, but let it be forward compatible */
#define MYSQLND_MAX_ALLOWED_DB_LEN 1024 /* 256 char * 4byte. MySQL supports now only 64 char in the tables, but on the FS could be different. Forward compatible. */
#define MYSQLND_NET_CMD_BUFFER_MIN_SIZE 4096