From 47cc6d54f4b7eac68aadade4b9c23409b678813b Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Wed, 26 Nov 2008 02:02:57 +0100
Subject: [PATCH] Fixed a bug where an invalid "SET character_set_results =
unicode" could be sent when unicode decode mode is disabled.
Rev: lib/modules/Sql.pmod/mysql.pike:1.43
---
lib/modules/Sql.pmod/mysql.pike | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/modules/Sql.pmod/mysql.pike b/lib/modules/Sql.pmod/mysql.pike
index c7ea9c0bc4..e9603f3b48 100644
--- a/lib/modules/Sql.pmod/mysql.pike
+++ b/lib/modules/Sql.pmod/mysql.pike
@@ -1,5 +1,5 @@
/*
- * $Id: mysql.pike,v 1.42 2008/06/28 16:49:55 nilsson Exp $
+ * $Id: mysql.pike,v 1.43 2008/11/26 01:02:57 mast Exp $
*
* Glue for the Mysql-module
*/
@@ -186,7 +186,7 @@ void set_unicode_decode_mode (int enable)
}
else {
CH_DEBUG("Disabling unicode decode mode.\n");
- ::big_query ("SET character_set_results = " + get_charset());
+ ::big_query ("SET character_set_results = " + ::get_charset());
utf8_mode &= ~UNICODE_DECODE_MODE;
}
}
@@ -804,8 +804,8 @@ int(0..1) is_keyword( string name )
}
protected void create(string|void host, string|void database,
- string|void user, string|void _password,
- mapping(string:string|int)|void options)
+ string|void user, string|void _password,
+ mapping(string:string|int)|void options)
{
string password = _password;
_password = "CENSORED";
--
GitLab