cvs: php4 /ext/mysql/libmysql charset.c libmysql.c
| From: | MySQL Team | Date: | Tue, 06 Nov 2001 16:59:08 +0000 |
| Subject: | cvs: php4 /ext/mysql/libmysql charset.c libmysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8089@lists.php.net to get a copy of this message | ||
mysql Tue Nov 6 11:59:08 2001 EDT
Modified files:
/php4/ext/mysql/libmysql charset.c libmysql.c
Log:
(PHP mysql_connect) Removed warning message regarding NONEXISTENT character
set, when the server's default character set != latin1.
@- Removed a warning message about a NONEXISTENT character set from
@ mysql_connect(), when the server's default character set != latin1.
Index: php4/ext/mysql/libmysql/charset.c
diff -u php4/ext/mysql/libmysql/charset.c:1.4 php4/ext/mysql/libmysql/charset.c:1.5
--- php4/ext/mysql/libmysql/charset.c:1.4 Tue Jan 23 11:48:49 2001
+++ php4/ext/mysql/libmysql/charset.c Tue Nov 6 11:59:07 2001
@@ -289,7 +289,8 @@
return NULL;
}
-static CHARSET_INFO *add_charset(uint cs_number, const char *cs_name)
+static CHARSET_INFO *add_charset(uint cs_number, const char *cs_name,
+ myf flags)
{
CHARSET_INFO tmp_cs,*cs;
uchar tmp_ctype[CTYPE_TABLE_SIZE];
@@ -304,7 +305,7 @@
cs->to_lower=tmp_to_lower;
cs->to_upper=tmp_to_upper;
cs->sort_order=tmp_sort_order;
- if (read_charset_file(cs_number, cs, MYF(MY_WME)))
+ if (read_charset_file(cs_number, cs, flags))
return NULL;
cs = (CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),
@@ -326,7 +327,7 @@
return cs;
}
-static CHARSET_INFO *get_internal_charset(uint cs_number)
+static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
{
CHARSET_INFO *cs;
/*
@@ -337,13 +338,13 @@
if (!(cs = find_charset((CHARSET_INFO**) cs_info_table.buffer, cs_number,
cs_info_table.elements)))
if (!(cs = find_compiled_charset(cs_number)))
- cs=add_charset(cs_number, get_charset_name(cs_number));
+ cs=add_charset(cs_number, get_charset_name(cs_number), flags);
pthread_mutex_unlock(&THR_LOCK_charset);
return cs;
}
-static CHARSET_INFO *get_internal_charset_by_name(const char *name)
+static CHARSET_INFO *get_internal_charset_by_name(const char *name, myf flags)
{
CHARSET_INFO *cs;
/*
@@ -354,7 +355,7 @@
if (!(cs = find_charset_by_name((CHARSET_INFO**) cs_info_table.buffer, name,
cs_info_table.elements)))
if (!(cs = find_compiled_charset_by_name(name)))
- cs=add_charset(get_charset_number(name), name);
+ cs=add_charset(get_charset_number(name), name, flags);
pthread_mutex_unlock(&THR_LOCK_charset);
return cs;
}
@@ -364,7 +365,7 @@
{
CHARSET_INFO *cs;
(void) init_available_charsets(MYF(0)); /* If it isn't initialized */
- cs=get_internal_charset(cs_number);
+ cs=get_internal_charset(cs_number, flags);
if (!cs && (flags & MY_WME))
{
@@ -396,7 +397,7 @@
{
CHARSET_INFO *cs;
(void) init_available_charsets(MYF(0)); /* If it isn't initialized */
- cs=get_internal_charset_by_name(cs_name);
+ cs=get_internal_charset_by_name(cs_name, flags);
if (!cs && (flags & MY_WME))
{
Index: php4/ext/mysql/libmysql/libmysql.c
diff -u php4/ext/mysql/libmysql/libmysql.c:1.8 php4/ext/mysql/libmysql/libmysql.c:1.9
--- php4/ext/mysql/libmysql/libmysql.c:1.8 Fri Jun 1 16:07:26 2001
+++ php4/ext/mysql/libmysql/libmysql.c Tue Nov 6 11:59:07 2001
@@ -1385,7 +1385,7 @@
charset_name=charset_name_buff;
sprintf(charset_name,"%d",mysql->server_language); /* In case of errors */
if (!(mysql->charset =
- get_charset((uint8) mysql->server_language, MYF(MY_WME))))
+ get_charset((uint8) mysql->server_language, MYF(0))))
mysql->charset = default_charset_info; /* shouldn't be fatal */
}