From: Georg Richter <georg@php.net>
Date: Sat, 21 May 2005 08:46:46 +0000 (+0000)
Subject: enabled set_charset for MySQL Versions >= 5.0.6
X-Git-Tag: php-5.0.1b1~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=230681b0b39bc7881e50c0e384369059d8f4e460;p=php

enabled set_charset for MySQL Versions >= 5.0.6
added testcase for bug #33090
---

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index 3d2cdffb73..4531bcd4de 100644
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -103,7 +103,7 @@ typedef struct {
 #define PHP_MYSQLI_API
 #endif
 
-#if MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000
+#if (MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID > 50005
 #define HAVE_MYSQLI_SET_CHARSET
 #endif
 
diff --git a/ext/mysqli/tests/bug33090.phpt b/ext/mysqli/tests/bug33090.phpt
new file mode 100644
index 0000000000..5c1cba961e
--- /dev/null
+++ b/ext/mysqli/tests/bug33090.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #33090
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+	include ("connect.inc");
+
+	/*** test mysqli_connect 127.0.0.1 ***/
+	$link = mysqli_connect($host, $user, $passwd);
+	mysqli_select_db($link, "test");
+
+	if (!($link->prepare("this makes no sense"))) {
+		printf("%d\n", $link->errno);
+		printf("%s\n", $link->sqlstate);
+	}	
+	$link->close();
+?>
+--EXPECT--
+1064
+42000