Merged Revisions 3771-3801 from stable branch.

tbrehm

2013-02-12 72695f0356210b5ca68d33d09e91c00ed9d6c2b6

 server/lib/classes/db_mysql.inc.php

@@ -45,6 +45,7 @@
  public $errorMessage = '';   // last error message
  private $errorLocation = '';// last error location
  public $show_error_messages = false; // false in server, true in interface
  private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor

  // constructor
  public function __construct($host = NULL , $user = NULL, $pass = NULL, $database = NULL) {
@@ -59,11 +60,20 @@
    $this->dbClientFlags = $conf['db_client_flags'];

    parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
    if ($this->connect_error) {
    $try = 0;
    while(!is_null($this->connect_error) && $try < 10) {
      if($try > 8) sleep(5);
      elseif($try > 0) sleep(1);
      
      $try++;
      $this->updateError('DB::__construct');
    } else {
      $this->setCharacterEncoding();
      
      parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
    }
    
    if(is_null($this->connect_error)) $this->isConnected = true;
    
    $this->setCharacterEncoding();
  }

  public function __destruct() {
@@ -79,7 +89,7 @@
  public function updateError($location) {
    global $app;

    if($this->connect_error) {
    if(!is_null($this->connect_error)) {
      $this->errorNumber = $this->connect_errno;
      $this->errorMessage = $this->connect_error;
    } else {
@@ -103,22 +113,24 @@
  }
  
  private function setCharacterEncoding() {
    if($this->isConnected == false) return false;
    parent::query( 'SET NAMES '.$this->dbCharset); 
    parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
  }

  public function query($queryString) {
    if($this->isConnected == false) return false;
    $try = 0;
    do {
        $try++;
        $ok = parent::ping();
        $ok = $this->ping();
        if(!$ok) {
            if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) {
            if(!$this->real_connect($this->dbHost, $this->dbUser, $this->dbPass, $this->dbName)) {
                if($try > 9) {
                    $this->updateError('DB::query -> reconnect');
                    return false;
                } else {
                    sleep(1);
                    sleep(($try > 7 ? 5 : 1));
                }
            } else {
                $this->setCharacterEncoding();
@@ -468,7 +480,7 @@

    // gibt Array mit Tabellennamen zur�ck
    public function getTables($database_name = '') {

      if($this->isConnected == false) return false;
      if($database_name == '') $database_name = $this->dbName;
      $result = parent::query("SHOW TABLES FROM $database_name");
      for ($i = 0; $i < $result->num_rows; $i++) {