← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sql/sql_plugin.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
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:
sql/sql_plugin.cc
1612
1612
      if (plugin_initialize(&tmp_root, plugin_ptr, argc, argv, !is_myisam &&
1613
1613
                            (flags & PLUGIN_INIT_SKIP_INITIALIZATION)))
1614
1614
      {
1615
 
        if (mandatory)
 
1615
        if (plugin_ptr->load_option == PLUGIN_FORCE)
1616
1616
          goto err_unlock;
1617
1617
        plugin_ptr->state= PLUGIN_IS_DISABLED;
1618
1618
      }