1 --- ext/pdo_mysql/mysql_driver.c 2006-12-02 17:26:53.000000000 +0100
2 +++ ext/pdo_mysql/mysql_driver.c 2006-12-02 17:27:12.000000000 +0100
4 pdo_mysql_db_handle *H;
6 char *host = NULL, *unix_socket = NULL;
7 + char *connect_charset = NULL;
8 unsigned int port = 3306;
10 struct pdo_data_src_parser vars[] = {
12 if (vars[2].optval && !strcmp("localhost", vars[2].optval)) {
13 unix_socket = vars[4].optval;
16 + connect_charset = PDOMYSQLG(connect_charset);
18 + if (connect_charset != NULL) {
19 + mysql_options(H->server, MYSQL_SET_CHARSET_NAME, connect_charset);
22 if (mysql_real_connect(H->server, host, dbh->username, dbh->password, dbname, port, unix_socket, connect_opts) == NULL) {
25 --- ext/pdo_mysql/pdo_mysql.c 2006-12-02 17:26:53.000000000 +0100
26 +++ ext/pdo_mysql/pdo_mysql.c 2006-12-02 17:27:12.000000000 +0100
28 #include "php_pdo_mysql.h"
29 #include "php_pdo_mysql_int.h"
31 +ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql)
32 +static PHP_GINIT_FUNCTION(pdo_mysql);
34 /* {{{ pdo_mysql_functions[] */
35 zend_function_entry pdo_mysql_functions[] = {
41 - STANDARD_MODULE_PROPERTIES
42 + PHP_MODULE_GLOBALS(pdo_mysql),
43 + PHP_GINIT(pdo_mysql),
46 + STANDARD_MODULE_PROPERTIES_EX
51 ZEND_GET_MODULE(pdo_mysql)
55 + STD_PHP_INI_ENTRY("pdo_mysql.connect_charset", NULL, PHP_INI_ALL, OnUpdateString, connect_charset, zend_pdo_mysql_globals, pdo_mysql_globals)
58 +static PHP_GINIT_FUNCTION(pdo_mysql)
60 + pdo_mysql_globals->connect_charset = NULL;
63 /* true global environment */
65 /* {{{ PHP_MINIT_FUNCTION
67 PHP_MINIT_FUNCTION(pdo_mysql)
69 + REGISTER_INI_ENTRIES();
71 REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_USE_BUFFERED_QUERY", (long)PDO_MYSQL_ATTR_USE_BUFFERED_QUERY);
72 REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_LOCAL_INFILE", (long)PDO_MYSQL_ATTR_LOCAL_INFILE);
73 REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_INIT_COMMAND", (long)PDO_MYSQL_ATTR_INIT_COMMAND);
76 PHP_MSHUTDOWN_FUNCTION(pdo_mysql)
78 + UNREGISTER_INI_ENTRIES();
79 php_pdo_unregister_driver(&pdo_mysql_driver);
83 php_info_print_table_start();
84 php_info_print_table_header(2, "PDO Driver for MySQL, client library version", mysql_get_client_info());
85 php_info_print_table_end();
87 + DISPLAY_INI_ENTRIES();
91 --- ext/pdo_mysql/php_pdo_mysql.h 2006-12-02 17:26:53.000000000 +0100
92 +++ ext/pdo_mysql/php_pdo_mysql.h 2006-12-02 17:28:49.000000000 +0100
94 PHP_RSHUTDOWN_FUNCTION(pdo_mysql);
95 PHP_MINFO_FUNCTION(pdo_mysql);
97 +ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql)
98 + char *connect_charset;
99 +ZEND_END_MODULE_GLOBALS(pdo_mysql)
102 +# define PDOMYSQLG(v) TSRMG(pdo_mysql_globals_id, zend_pdo_mysql_globals *, v)
104 +# define PDOMYSQLG(v) (pdo_mysql_globals.v)
107 +ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql)
109 #endif /* PHP_PDO_MYSQL_H */