johannes Tue Aug 19 10:42:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlnd mysqlnd.c mysqlnd_priv.h
Log:
MFH: constify strings
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.25&r2=1.5.2.26&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.25
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.26
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.25 Tue Aug 19 10:16:12 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Aug 19 10:42:11 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.c,v 1.5.2.25 2008/08/19 10:16:12 johannes Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.26 2008/08/19 10:42:11 johannes Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -58,9 +58,9 @@
-const char * mysqlnd_old_passwd = "mysqlnd cannot connect to MySQL 4.1+ using
old authentication";
-const char * mysqlnd_server_gone = "MySQL server has gone away";
-const char * mysqlnd_out_of_sync = "Commands out of sync; you can't run this
command now";
+const char * const mysqlnd_old_passwd = "mysqlnd cannot connect to MySQL 4.1+
using old authentication";
+const char * const mysqlnd_server_gone = "MySQL server has gone away";
+const char * const mysqlnd_out_of_sync = "Commands out of sync; you can't run
this command now";
MYSQLND_STATS *mysqlnd_global_stats = NULL;
static zend_bool mysqlnd_library_initted = FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_priv.h?r1=1.4.2.12&r2=1.4.2.13&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_priv.h
diff -u php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.12
php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.13
--- php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.12 Thu Apr 24 14:22:19 2008
+++ php-src/ext/mysqlnd/mysqlnd_priv.h Tue Aug 19 10:42:11 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_priv.h,v 1.4.2.12 2008/04/24 14:22:19 andrey Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.4.2.13 2008/08/19 10:42:11 johannes Exp $ */
#ifndef MYSQLND_PRIV_H
#define MYSQLND_PRIV_H
@@ -163,8 +163,9 @@
extern struct st_mysqlnd_perm_bind mysqlnd_ps_fetch_functions[MYSQL_TYPE_LAST
+ 1];
-extern const char * mysqlnd_out_of_sync;
-extern const char * mysqlnd_server_gone;
+extern const char * const mysqlnd_old_passwd;
+extern const char * const mysqlnd_out_of_sync;
+extern const char * const mysqlnd_server_gone;
enum_func_status mysqlnd_handle_local_infile(MYSQLND *conn, const char
*filename, zend_bool *is_warning TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
