georg           Sat May 21 04:46:47 2005 EDT

  Added files:                 
    /php-src/ext/mysqli/tests   bug33090.phpt 

  Modified files:              
    /php-src/ext/mysqli php_mysqli.h 
  Log:
  enabled set_charset for MySQL Versions >= 5.0.6
  added testcase for bug #33090
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.47&r2=1.48&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.47 
php-src/ext/mysqli/php_mysqli.h:1.48
--- php-src/ext/mysqli/php_mysqli.h:1.47        Fri May 13 09:30:22 2005
+++ php-src/ext/mysqli/php_mysqli.h     Sat May 21 04:46:45 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: php_mysqli.h,v 1.47 2005/05/13 13:30:22 georg Exp $ 
+  $Id: php_mysqli.h,v 1.48 2005/05/21 08:46:45 georg Exp $ 
 */
 
 /* A little hack to prevent build break, when mysql is used together with
@@ -103,7 +103,7 @@
 #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
 

http://cvs.php.net/co.php/php-src/ext/mysqli/tests/bug33090.phpt?r=1.1&p=1
Index: php-src/ext/mysqli/tests/bug33090.phpt
+++ php-src/ext/mysqli/tests/bug33090.phpt
--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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to