← Back to branch summary

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

« 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
  • Date: 2014-08-27 21:12:36 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20140827211236-se41hwfe4xy0hpef
Tags: 5.5.39-2
http://bugs.debian.org/759309
http://bugs.debian.org/759813
* d/control: Removed Provides: libmysqlclient-dev (Closes: #759309)
* d/control: Removed Provides: libmysqld-dev with same motivation
* Re-introduced tha HPPA build patch as the upstream fix wasn't complete
* Fixed all kFreeBSD build and test suite issues
* Added Italian translation (Closes: #759813)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
2658
2658
 
2659
2659
        if (innodb_inited) {
2660
2660
 
 
2661
                THD *thd= current_thd;
 
2662
                if (thd) { // may be UNINSTALL PLUGIN statement
 
2663
                        trx_t* trx = thd_to_trx(thd);
 
2664
                        if (trx) {
 
2665
                                trx_free_for_mysql(trx);
 
2666
                        }
 
2667
                }
 
2668
 
2661
2669
                srv_fast_shutdown = (ulint) innobase_fast_shutdown;
2662
2670
                innodb_inited = 0;
2663
2671
                hash_table_free(innobase_open_tables);
9936
9944
        DBUG_RETURN(FALSE);
9937
9945
}
9938
9946
 
 
9947
static MYSQL_SYSVAR_UINT(simulate_comp_failures, srv_simulate_comp_failures,
 
9948
  PLUGIN_VAR_NOCMDARG,
 
9949
  "Simulate compression failures.",
 
9950
  NULL, NULL, 0, 0, 99, 0);
 
9951
 
9939
9952
static
9940
9953
bool innobase_show_status(handlerton *hton, THD* thd, 
9941
9954
                          stat_print_fn* stat_print,
12019
12032
  MYSQL_SYSVAR(trx_purge_view_update_only_debug),
12020
12033
#endif /* UNIV_DEBUG */
12021
12034
  MYSQL_SYSVAR(print_all_deadlocks),
 
12035
  MYSQL_SYSVAR(simulate_comp_failures),
12022
12036
  NULL
12023
12037
};
12024
12038