pike.git/ lib/ modules/ Sql.pmod/ mysql.pike

2006-08-22

2006-08-22 11:24:16 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 824d4dfdc2a7e88a8de68df3200ef1a2bd21a5f9 (17 lines) (+12/-5) ^{[ Show | Annotate ]}
  Branch: 7.6

Bugfix for Mysql 4.0 and earlier.
Let character_set_connection mirror character_set_client to get reasonable behaviour for both narrow and wide queries.

Rev: lib/modules/Sql.pmod/mysql.pike:1.24

1:   /* -  * $Id: mysql.pike,v 1.23 2006/08/15 14:51:28 grubba Exp $ +  * $Id: mysql.pike,v 1.24 2006/08/22 11:24:16 grubba Exp $    *    * Glue for the Mysql-module    */
549:    string restore_charset;    if (charset) {    restore_charset = send_charset || get_charset(); -  if (charset != restore_charset) +  if (charset != restore_charset) {    ::big_query ("SET character_set_client=" + charset); -  else +  ::big_query ("SET character_set_connection=" + charset); +  } else    restore_charset = 0;    }   
578:       if (new_send_charset != send_charset) {    mixed err; -  if (err = ::big_query("SET character_set_client=" + new_send_charset)) { +  if (err = catch { +  ::big_query("SET character_set_client=" + new_send_charset); +  ::big_query("SET character_set_connection=" + new_send_charset); +  }) {    if (new_send_charset == "utf8")    predef::error ("The query is a wide string "    "and the MySQL server doesn't support UTF-8: %s\n",
594:    if (restore_charset) {    if (send_charset && (<"latin1", "utf8">)[charset])    send_charset = charset; -  else +  else {    ::big_query("SET character_set_client=" + restore_charset); -  +  ::big_query("SET character_set_connection=" + restore_charset);    } -  +  }       if (!objectp(res)) return res;