~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to storage/xtradb/handler/ha_innodb.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-04-17 20:55:22 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140417205522-wof4l36nxhlkn89m
* New upstream release, fixing the following security issues:
  * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
    - CVE-2014-0384 
    - CVE-2014-2419 
    - CVE-2014-2430 
    - CVE-2014-2431 
    - CVE-2014-2432 
    - CVE-2014-2436 
    - CVE-2014-2438 
    - CVE-2014-2440
* Re-enabled TokuDB with "if arch amd64" in d/rules
* Applied patch to log init output better
  (Closes https://mariadb.atlassian.net/browse/MDEV-5957)

Show diffs side-by-side

added added

removed removed

Lines of Context:
8837
8837
        error = row_rename_table_for_mysql(
8838
8838
                norm_from, norm_to, trx, lock_and_commit);
8839
8839
 
8840
 
        if (error != DB_SUCCESS) {
8841
 
                FILE* ef = dict_foreign_err_file;
8842
 
 
8843
 
                DBUG_PRINT("info", ("rename failed: %d", error));
8844
 
                fputs("InnoDB: Renaming table ", ef);
8845
 
                ut_print_name(ef, trx, TRUE, norm_from);
8846
 
                fputs(" to ", ef);
8847
 
                ut_print_name(ef, trx, TRUE, norm_to);
8848
 
                fputs(" failed!\n", ef);
8849
 
        }
8850
 
 
8851
8840
        if (lock_and_commit) {
8852
8841
                row_mysql_unlock_data_dictionary(trx);
8853
8842