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

« back to all changes in this revision

Viewing changes to sql/sql_trigger.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:
653
653
  */
654
654
  old_field= new_field= table->field;
655
655
 
656
 
  for (trg_field= (Item_trigger_field *)(lex->trg_table_fields.first);
 
656
  for (trg_field= lex->trg_table_fields.first;
657
657
       trg_field; trg_field= trg_field->next_trg_field)
658
658
  {
659
659
    /*
1297
1297
 
1298
1298
        thd->variables.sql_mode= (ulong)*trg_sql_mode;
1299
1299
 
1300
 
        Parser_state parser_state(thd,
1301
 
                                  trg_create_str->str,
1302
 
                                  trg_create_str->length);
 
1300
        Parser_state parser_state;
 
1301
        if (parser_state.init(thd, trg_create_str->str, trg_create_str->length))
 
1302
          goto err_with_lex_cleanup;
1303
1303
 
1304
1304
        Trigger_creation_ctx *creation_ctx=
1305
1305
          Trigger_creation_ctx::create(thd,
1413
1413
        */
1414
1414
        triggers->trigger_fields[lex.trg_chistics.event]
1415
1415
                                [lex.trg_chistics.action_time]=
1416
 
          (Item_trigger_field *)(lex.trg_table_fields.first);
 
1416
          lex.trg_table_fields.first;
1417
1417
        /*
1418
1418
          Also let us bind these objects to Field objects in table being
1419
1419
          opened.
1423
1423
          SELECT)...
1424
1424
          Anyway some things can be checked only during trigger execution.
1425
1425
        */
1426
 
        for (Item_trigger_field *trg_field=
1427
 
               (Item_trigger_field *)(lex.trg_table_fields.first);
 
1426
        for (Item_trigger_field *trg_field= lex.trg_table_fields.first;
1428
1427
             trg_field;
1429
1428
             trg_field= trg_field->next_trg_field)
1430
1429
        {