← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen, Otto Kekäläinen, James Page
  • Date: 2014-03-02 01:38:26 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20140302013826-z3afnfteqo86pccd
Tags: 5.5.36-1
http://bugs.debian.org/739750
http://bugs.debian.org/739841
http://bugs.debian.org/739360
[ Otto Kekäläinen ]
* New upstream release.
* Updated Danish debconf translation (Closes: #739750).
* d/control: Added explicit Conflicts/Replaces for mysql-5.6 packages
  (Closes: #739841).
* d/control: Update for use of virtual-* packages for switching to/from
  MySQL alternatives.

[ James Page ]
* d/control: Drop Nicholas from Uploaders, MIA (Closes: #739360).
* d/control: Add libjemalloc-dev to BD's.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
7753
7753
        error = row_rename_table_for_mysql(
7754
7754
                norm_from, norm_to, trx, lock_and_commit);
7755
7755
 
7756
 
        if (error != DB_SUCCESS) {
7757
 
                FILE* ef = dict_foreign_err_file;
7758
 
 
7759
 
                fputs("InnoDB: Renaming table ", ef);
7760
 
                ut_print_name(ef, trx, TRUE, norm_from);
7761
 
                fputs(" to ", ef);
7762
 
                ut_print_name(ef, trx, TRUE, norm_to);
7763
 
                fputs(" failed!\n", ef);
7764
 
        }
7765
 
 
7766
7756
        if (lock_and_commit) {
7767
7757
                row_mysql_unlock_data_dictionary(trx);
7768
7758