--- db.inc.php	2013-07-11 08:45:54.000000000 +0200
+++ db.inc.php	2013-07-11 08:57:52.000000000 +0200
@@ -72,20 +72,14 @@
 
 		switch ($DB['TYPE']) {
 			case ZBX_DB_MYSQL:
-				$mysql_server = $DB['SERVER'].(!empty($DB['PORT']) ? ':'.$DB['PORT'] : '');
+				$DB['DB'] = mysqli_connect($DB['SERVER'], $DB['USER'], $DB['PASSWORD'], $DB['DATABASE'], $DB['PORT'] );
 
-				if (!$DB['DB'] = mysql_connect($mysql_server, $DB['USER'], $DB['PASSWORD'])) {
-					$error = 'Error connecting to database ['.mysql_error().']';
+				if (!$DB['DB']) {
+					$error = 'Error connecting to database ['.mysqli_connect_error().']';
 					$result = false;
 				}
 				else {
-					if (!mysql_select_db($DB['DATABASE'])) {
-						$error = 'Error database in selection ['.mysql_error().']';
-						$result = false;
-					}
-					else {
-						DBexecute('SET NAMES utf8');
-					}
+					DBexecute('SET NAMES utf8');
 				}
 				break;
 			case ZBX_DB_POSTGRESQL:
@@ -191,7 +185,7 @@
 	if (isset($DB['DB']) && !empty($DB['DB'])) {
 		switch ($DB['TYPE']) {
 			case ZBX_DB_MYSQL:
-				$result = mysql_close($DB['DB']);
+				$result = mysqli_close($DB['DB']);
 				break;
 			case ZBX_DB_POSTGRESQL:
 				$result = pg_close($DB['DB']);
@@ -432,8 +426,8 @@
 
 	switch ($DB['TYPE']) {
 		case ZBX_DB_MYSQL:
-			if (!$result = mysql_query($query, $DB['DB'])) {
-				error('Error in query ['.$query.'] ['.mysql_error().']');
+			if (!$result = mysqli_query($DB['DB'], $query)) {
+				error('Error in query ['.$query.'] ['.mysqli_error($DB['DB']).']');
 			}
 			break;
 		case ZBX_DB_POSTGRESQL:
@@ -503,8 +497,8 @@
 
 	switch ($DB['TYPE']) {
 		case ZBX_DB_MYSQL:
-			if (!$result = mysql_query($query, $DB['DB'])) {
-				error('Error in query ['.$query.'] ['.mysql_error().']');
+			if (!$result = mysqli_query($DB['DB'], $query)) {
+				error('Error in query ['.$query.'] ['.mysqli_error($DB['DB']).']');
 			}
 			break;
 		case ZBX_DB_POSTGRESQL:
@@ -569,8 +563,8 @@
 
 	switch ($DB['TYPE']) {
 		case ZBX_DB_MYSQL:
-			if (!$result = mysql_fetch_assoc($cursor)) {
-				mysql_free_result($cursor);
+			if (!$result = mysqli_fetch_assoc($cursor)) {
+				mysqli_free_result($cursor);
 			}
 			break;
 		case ZBX_DB_POSTGRESQL:
@@ -641,13 +635,14 @@
 // string value prepearing
 if (isset($DB['TYPE']) && $DB['TYPE'] == ZBX_DB_MYSQL) {
 	function zbx_dbstr($var) {
+                global $DB;
 		if (is_array($var)) {
 			foreach ($var as $vnum => $value) {
-				$var[$vnum] = "'".mysql_real_escape_string($value)."'";
+				$var[$vnum] = "'".mysqli_real_escape_string($DB['DB'], $value)."'";
 			}
 			return $var;
 		}
-		return "'".mysql_real_escape_string($var)."'";
+		return "'".mysqli_real_escape_string($DB['DB'], $var)."'";
 	}
 
 	function zbx_dbcast_2bigint($field) {