~clint-fewbar/ubuntu/natty/mysql-5.1/merge-5.1.49-2

« back to all changes in this revision

Viewing changes to sql/sql_delete.cc

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-08-04 13:18:27 UTC
  • mfrom: (1.2.2 upstream) (2.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100804131827-4tjg88vr9dd49s3k
Tags: 5.1.49-1ubuntu1
* Merge from debian unstable:
  + debian/control:
     * Update maintainer according to spec.
     * Move section from "misc" to "database".
     * Added libmysqlclient16-dev an empty transitional package. 
     * Added mysql-client-core-5.1 package.
     * Suggest mailx for mysql-server-5.1
     * Add mysql-testsuite package so you can run the testsuite seperately.
  + debian/additions/my.cnf:
    * Remove language options. Error message files are located in a different directory in Mysql
      5.0. Setting the language option to use /usr/share/mysql/english breaks Mysql 5.0. Both 5.0
      and 5.1 use a different value that works. (LP: #316974)
  + Add apparmor profile:
    + debian/apparmor-profile: apparmor-profile
    + debian/rules, debian/mysql-server-5.1.files: install apparmor profile
    + debian/mysql-server-5.1.dirs: add etc/apparmor.d/fore-complain
    + debian/mysql-server-5.1.postrm: remove symlink in force-complain/ on purge.
    + debian/mysql-server-5.1.README.Debian: add apparmor documentation.
    + debian/additions/my.cnf: Add warning about apparmor. (LP: #201799)
    + debian/mysql-server-5.1.postinst: reload apparmor profiles
  * Convert the package from sysvinit to upstart:
    + debian/mysql-server-5.1.mysql.upstart: Add upstart script.
    + debian/mysql-server-5.1.mysql.init: Dropped, unused now with upstart.
    + debian/additions/mysqld_safe_syslog.cnf: Dropped, unused now with upstart.
    + debian/additons/my.cnf: Remove pid declaration and setup error logging to /var/log/mysql since
      we're not piping anything around logger anymore.
    + debian/rules, debian/mysql-server-5.1.logcheck.ignore.{paranoid,worstation},
      debian/mysql-server-5.1.logcheck.ignore.server: : Remove references to mysqld_safe
    + debian/patches/38_scripts_mysqld_safe.sh_signals.dpatch: Dropped
  * Added -fno-strict-aliasing to CFLAGS to get around mysql testsuite build failures.
  * Add Apport hook (LP: #354188):
    + debian/mysql-server-5.1.py: apport package hook
    + debian/rules: Make it installable
  * debian/mysql-server-5.1.mysql-server.logrotate: Check to see if mysql is running before
    running logrotate. (LP: #513135)
  * Make the testsuite installable. (LP: #530752)
    + debian/mysql-server-5.1.files, debian/rules: install apport package hook
  * debian/mysql-server-5.1.preinst: Set mysql user's home directory
    to /nonexistent to protect against having the /var/lib/mysql
    user-writeable. If an attacker can trick mysqld into creating
    dot files in the home directory, he could do .rhost-like attacks
    on the system. (LP: #293258)
  * debian/control: mysql-client-5.1 should depend on mysql-core-client-5.1.
    (LP: #590952) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
*/
34
34
 
35
35
bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
36
 
                  SQL_LIST *order, ha_rows limit, ulonglong options,
 
36
                  SQL_I_List<ORDER> *order, ha_rows limit, ulonglong options,
37
37
                  bool reset_auto_increment)
38
38
{
39
39
  bool          will_batch;
84
84
 
85
85
      if (select_lex->setup_ref_array(thd, order->elements) ||
86
86
          setup_order(thd, select_lex->ref_pointer_array, &tables,
87
 
                    fields, all_fields, (ORDER*) order->first))
 
87
                    fields, all_fields, order->first))
88
88
    {
89
89
      delete select;
90
90
      free_underlaid_joins(thd, &thd->lex->select_lex);
230
230
    ha_rows examined_rows;
231
231
    
232
232
    if ((!select || table->quick_keys.is_clear_all()) && limit != HA_POS_ERROR)
233
 
      usable_index= get_index_for_order(table, (ORDER*)(order->first), limit);
 
233
      usable_index= get_index_for_order(table, order->first, limit);
234
234
 
235
235
    if (usable_index == MAX_KEY)
236
236
    {
237
237
      table->sort.io_cache= (IO_CACHE *) my_malloc(sizeof(IO_CACHE),
238
238
                                                   MYF(MY_FAE | MY_ZEROFILL));
239
239
    
240
 
      if (!(sortorder= make_unireg_sortorder((ORDER*) order->first,
 
240
      if (!(sortorder= make_unireg_sortorder(order->first,
241
241
                                             &length, NULL)) ||
242
242
          (table->sort.found_records = filesort(thd, table, sortorder, length,
243
243
                                                select, HA_POS_ERROR, 1,
547
547
int mysql_multi_delete_prepare(THD *thd)
548
548
{
549
549
  LEX *lex= thd->lex;
550
 
  TABLE_LIST *aux_tables= (TABLE_LIST *)lex->auxiliary_table_list.first;
 
550
  TABLE_LIST *aux_tables= lex->auxiliary_table_list.first;
551
551
  TABLE_LIST *target_tbl;
552
552
  DBUG_ENTER("mysql_multi_delete_prepare");
553
553