[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

2011-01-31 Thread Andrey Hristov 
andrey   Mon, 31 Jan 2011 13:52:21 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=307883

Log:
Add two new enums constants from the server

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2011-01-31 13:29:18 UTC (rev 307882)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2011-01-31 13:52:21 UTC (rev 307883)
@@ -157,6 +157,8 @@
MYSQL_REPORT_DATA_TRUNCATION,
MYSQL_OPT_RECONNECT,
MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+   MYSQL_PLUGIN_DIR,
+   MYSQL_DEFAULT_AUTH,
 #if MYSQLND_UNICODE
MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE = 200,
 #endif

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2011-01-31 13:29:18 UTC 
(rev 307882)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2011-01-31 13:52:21 UTC 
(rev 307883)
@@ -162,6 +162,8 @@
MYSQL_REPORT_DATA_TRUNCATION,
MYSQL_OPT_RECONNECT,
MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+   MYSQL_PLUGIN_DIR,
+   MYSQL_DEFAULT_AUTH,
 #if MYSQLND_UNICODE
MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE = 200,
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

2011-01-10 Thread Andrey Hristov 
andrey   Mon, 10 Jan 2011 15:14:56 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=307340

Log:
new flag

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2011-01-10 13:07:21 UTC (rev 307339)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2011-01-10 15:14:56 UTC (rev 307340)
@@ -92,6 +92,7 @@
 #define CLIENT_MULTI_STATEMENTS(1UL  16) /* Enable/disable 
multi-stmt support */
 #define CLIENT_MULTI_RESULTS   (1UL  17) /* Enable/disable 
multi-results */
 #define CLIENT_PS_MULTI_RESULTS(1UL  18) /* Multi-results in 
PS-protocol */
+#define CLIENT_PLUGIN_AUTH (1UL  19) /* Client supports 
plugin authentication */

 #define CLIENT_SSL_VERIFY_SERVER_CERT (1UL  30)


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2011-01-10 13:07:21 UTC 
(rev 307339)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2011-01-10 15:14:56 UTC 
(rev 307340)
@@ -92,6 +92,7 @@
 #define CLIENT_MULTI_STATEMENTS(1UL  16) /* Enable/disable 
multi-stmt support */
 #define CLIENT_MULTI_RESULTS   (1UL  17) /* Enable/disable 
multi-results */
 #define CLIENT_PS_MULTI_RESULTS(1UL  18) /* Multi-results in 
PS-protocol */
+#define CLIENT_PLUGIN_AUTH (1UL  19) /* Client supports 
plugin authentication */

 #define CLIENT_SSL_VERIFY_SERVER_CERT (1UL  30)


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

2010-12-02 Thread Andrey Hristov 
andrey   Thu, 02 Dec 2010 13:59:56 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305904

Log:
new server constant as of 5.5

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-12-02 13:59:38 UTC (rev 305903)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-12-02 13:59:56 UTC (rev 305904)
@@ -64,6 +64,7 @@
 #define SERVER_STATUS_DB_DROPPED   256 /* A 
database was dropped */
 #define SERVER_STATUS_NO_BACKSLASH_ESCAPES 512
 #define SERVER_QUERY_WAS_SLOW  2048
+#define SERVER_PS_OUT_PARAMS   4096

 #define MYSQLND_NO_DATA100
 #define MYSQLND_DATA_TRUNCATED 101

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-12-02 13:59:38 UTC 
(rev 305903)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-12-02 13:59:56 UTC 
(rev 305904)
@@ -64,6 +64,7 @@
 #define SERVER_STATUS_DB_DROPPED   256 /* A 
database was dropped */
 #define SERVER_STATUS_NO_BACKSLASH_ESCAPES 512
 #define SERVER_QUERY_WAS_SLOW  2048
+#define SERVER_PS_OUT_PARAMS   4096

 #define MYSQLND_NO_DATA100
 #define MYSQLND_DATA_TRUNCATED 101

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

2010-10-05 Thread Andrey Hristov 
andrey   Tue, 05 Oct 2010 14:56:49 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=304104

Log:
remove trailing commas in enums

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-10-05 14:41:08 UTC (rev 304103)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-10-05 14:56:49 UTC (rev 304104)
@@ -100,21 +100,21 @@
 typedef enum mysqlnd_extension
 {
MYSQLND_MYSQL = 0,
-   MYSQLND_MYSQLI,
+   MYSQLND_MYSQLI
 } enum_mysqlnd_extension;

 enum
 {
MYSQLND_FETCH_ASSOC = 1,
MYSQLND_FETCH_NUM = 2,
-   MYSQLND_FETCH_BOTH = 1|2,
+   MYSQLND_FETCH_BOTH = 1|2
 };

 /* Follow libmysql convention */
 typedef enum func_status
 {
PASS = 0,
-   FAIL = 1,
+   FAIL = 1
 } enum_func_status;

 typedef enum mysqlnd_query_type
@@ -296,7 +296,7 @@
CONN_SENDING_LOAD_DATA,
CONN_FETCHING_DATA,
CONN_NEXT_RESULT_PENDING,
-   CONN_QUIT_SENT, /* object is destroyed at this stage */
+   CONN_QUIT_SENT /* object is destroyed at this stage */
 } enum_mysqlnd_connection_state;


@@ -307,7 +307,7 @@
MYSQLND_STMT_EXECUTED,
MYSQLND_STMT_WAITING_USE_OR_STORE,
MYSQLND_STMT_USE_OR_STORE_CALLED,
-   MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
+   MYSQLND_STMT_USER_FETCHING /* fetch_row_buff or fetch_row_unbuf */
 } enum_mysqlnd_stmt_state;


@@ -520,7 +520,7 @@
PROT_STATS_PACKET,
PROT_PREPARE_RESP_PACKET,
PROT_CHG_USER_RESP_PACKET,
-   PROT_LAST, /* should always be last */
+   PROT_LAST /* should always be last */
 };



Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-10-05 14:41:08 UTC 
(rev 304103)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-10-05 14:56:49 UTC 
(rev 304104)
@@ -100,21 +100,21 @@
 typedef enum mysqlnd_extension
 {
MYSQLND_MYSQL = 0,
-   MYSQLND_MYSQLI,
+   MYSQLND_MYSQLI
 } enum_mysqlnd_extension;

 enum
 {
MYSQLND_FETCH_ASSOC = 1,
MYSQLND_FETCH_NUM = 2,
-   MYSQLND_FETCH_BOTH = 1|2,
+   MYSQLND_FETCH_BOTH = 1|2
 };

 /* Follow libmysql convention */
 typedef enum func_status
 {
PASS = 0,
-   FAIL = 1,
+   FAIL = 1
 } enum_func_status;

 typedef enum mysqlnd_query_type
@@ -296,7 +296,7 @@
CONN_SENDING_LOAD_DATA,
CONN_FETCHING_DATA,
CONN_NEXT_RESULT_PENDING,
-   CONN_QUIT_SENT, /* object is destroyed at this stage */
+   CONN_QUIT_SENT /* object is destroyed at this stage */
 } enum_mysqlnd_connection_state;


@@ -307,7 +307,7 @@
MYSQLND_STMT_EXECUTED,
MYSQLND_STMT_WAITING_USE_OR_STORE,
MYSQLND_STMT_USE_OR_STORE_CALLED,
-   MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
+   MYSQLND_STMT_USER_FETCHING /* fetch_row_buff or fetch_row_unbuf */
 } enum_mysqlnd_stmt_state;


@@ -520,7 +520,7 @@
PROT_STATS_PACKET,
PROT_PREPARE_RESP_PACKET,
PROT_CHG_USER_RESP_PACKET,
-   PROT_LAST, /* should always be last */
+   PROT_LAST /* should always be last */
 };



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

2010-09-27 Thread Andrey Hristov 
andrey   Mon, 27 Sep 2010 11:23:01 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=303780

Log:
Fix the value, it was bumped

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-09-27 07:08:04 UTC (rev 303779)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-09-27 11:23:01 UTC (rev 303780)
@@ -63,7 +63,7 @@
 #define SERVER_STATUS_LAST_ROW_SENT128
 #define SERVER_STATUS_DB_DROPPED   256 /* A 
database was dropped */
 #define SERVER_STATUS_NO_BACKSLASH_ESCAPES 512
-#define SERVER_QUERY_WAS_SLOW  1024
+#define SERVER_QUERY_WAS_SLOW  2048

 #define MYSQLND_NO_DATA100
 #define MYSQLND_DATA_TRUNCATED 101

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-09-27 07:08:04 UTC 
(rev 303779)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-09-27 11:23:01 UTC 
(rev 303780)
@@ -63,7 +63,7 @@
 #define SERVER_STATUS_LAST_ROW_SENT128
 #define SERVER_STATUS_DB_DROPPED   256 /* A 
database was dropped */
 #define SERVER_STATUS_NO_BACKSLASH_ESCAPES 512
-#define SERVER_QUERY_WAS_SLOW  1024
+#define SERVER_QUERY_WAS_SLOW  2048

 #define MYSQLND_NO_DATA100
 #define MYSQLND_DATA_TRUNCATED 101

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

2010-04-27 Thread Andrey Hristov 
andrey   Tue, 27 Apr 2010 11:02:51 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=298650

Log:
Of course, 64*4 is 256, not 1024

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-04-27 10:53:27 UTC (rev 298649)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-04-27 11:02:51 UTC (rev 298650)
@@ -39,8 +39,8 @@
 #define MYSQLND_SQLSTATE_LENGTH5
 #define MYSQLND_SQLSTATE_NULL  0

-#define MYSQLND_MAX_ALLOWED_USER_LEN   1024  /* 64 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_MAX_ALLOWED_USER_LEN   256 /* 64 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_SIZE4096
 #define MYSQLND_NET_CMD_BUFFER_MIN_SIZE_STR4096

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-04-27 10:53:27 UTC 
(rev 298649)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-04-27 11:02:51 UTC 
(rev 298650)
@@ -39,8 +39,8 @@
 #define MYSQLND_SQLSTATE_LENGTH5
 #define MYSQLND_SQLSTATE_NULL  0

-#define MYSQLND_MAX_ALLOWED_USER_LEN   1024  /* 64 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_MAX_ALLOWED_USER_LEN   256 /* 64 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_SIZE4096
 #define MYSQLND_NET_CMD_BUFFER_MIN_SIZE_STR4096

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php