Merge branch 'w12_MDL-29515_m23_deprdb' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Mar 2012 01:25:47 +0000 (09:25 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Mar 2012 01:25:47 +0000 (09:25 +0800)
1  2 
lib/dml/moodle_database.php
lib/dml/mssql_native_moodle_database.php
lib/dml/mysqli_native_moodle_database.php
lib/dml/oci_native_moodle_database.php
lib/dml/pgsql_native_moodle_database.php
lib/dml/simpletest/testdml.php
lib/dml/sqlsrv_native_moodle_database.php

Simple merge
@@@ -4617,13 -4479,3 +4590,13 @@@ class moodle_database_for_testing exten
      public function commit_transaction() {}
      public function rollback_transaction() {}
  }
- }
 +
 +
 +/**
 + * Dumb test class with toString() returrning 1.
 + */
 +class dml_test_object_one {
 +    public function __toString() {
 +        return 1;
 +    }
++}