← Back to branch summary

~ubuntu-branches/ubuntu/raring/mysql-5.5/raring-proposed

« back to all changes in this revision

Viewing changes to sql/sql_yacc.yy

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-02-14 23:59:22 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120214235922-cux5uek1e5l0hje9
Tags: 5.5.20-0ubuntu1
https://launchpad.net/bugs/688541
https://launchpad.net/bugs/907465
https://launchpad.net/bugs/917542
https://launchpad.net/bugs/912487
http://bugs.debian.org/659566
* New upstream release.
* d/mysql-server-5.5.mysql.upstart: Fix stop on to make sure mysql is
  fully stopped before shutdown commences. (LP: #688541) Also simplify
  start on as it is redundant.
* d/control: Depend on upstart version which has apparmor profile load
  script to prevent failure on upgrade from lucid to precise.
  (LP: #907465)
* d/apparmor-profile: need to allow /run since that is the true path
  of /var/run files. (LP: #917542)
* d/control: mysql-server-5.5 has files in it that used to be owned
  by libmysqlclient-dev, so it must break/replace it. (LP: #912487)
* d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
  change compiler back to system default.
* d/rules: Turn off embedded libedit/readline.(Closes: #659566)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_yacc.yy
1863
1863
            LEX *lex = Lex;
1864
1864
            lex->sql_command = SQLCOM_CHANGE_MASTER;
1865
1865
            bzero((char*) &lex->mi, sizeof(lex->mi));
1866
 
            /*
1867
 
              resetting flags that can left from the previous CHANGE MASTER
1868
 
            */
1869
1866
            lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_UNCHANGED;
1870
 
            my_init_dynamic_array(&Lex->mi.repl_ignore_server_ids,
1871
 
                                  sizeof(::server_id), 16, 16);
 
1867
 
 
1868
            DBUG_ASSERT(Lex->mi.repl_ignore_server_ids.elements == 0);
1872
1869
          }
1873
1870
          master_defs
1874
1871
          {}
1979
1976
ignore_server_id:
1980
1977
          ulong_num
1981
1978
          {
 
1979
            if (Lex->mi.repl_ignore_server_ids.elements == 0)
 
1980
            {
 
1981
              my_init_dynamic_array2(&Lex->mi.repl_ignore_server_ids,
 
1982
                                     sizeof(::server_id),
 
1983
                                     Lex->mi.server_ids_buffer,
 
1984
                                     array_elements(Lex->mi.server_ids_buffer),
 
1985
                                     16);
 
1986
            }
1982
1987
            insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1));
1983
1988
          }
1984
1989
 
9965
9970
          }
9966
9971
          splocal->limit_clause_param= TRUE;
9967
9972
          $$= splocal;
9968
 
        } | param_marker
 
9973
        }
 
9974
        | param_marker
9969
9975
        {
9970
9976
          ((Item_param *) $1)->limit_clause_param= TRUE;
9971
9977
        }