1. 27 Mar, 2013 6 commits
    • Georgi Kodinov's avatar
      merge 5.1->5.5 · 3c358724
      Georgi Kodinov authored
      3c358724
    • Georgi Kodinov's avatar
      Bug #16451878: GEOMETRY QUERY CRASHES SERVER · 0f31bfea
      Georgi Kodinov authored
      The GIS WKB reader was checking for the presence of
      enough data by first multiplying the number read (where
      it could overflow) and only then comparing it to the
      number of bytes available.
      This can overflow and effectively turn off the check.
      Fixed by:
      1. Introducing a new function that does division only so
      no overflow is possible.
      2. Using the proper macros and parenthesizing them.
      3. Doing an in-line division check in the only place where
      the boundary check is done over a data structure other
      than a dense points array.
      0f31bfea
    • Nuno Carvalho's avatar
      BUG#16541422: LOG-SLAVE-UPDATES + REPLICATE-WILD-IGNORE-TABLE FAILS FOR USER VARIABLES · accc5d92
      Nuno Carvalho authored
      Merge from mysql-5.1 into mysql-5.5.
      accc5d92
    • Nuno Carvalho's avatar
      BUG#16541422: LOG-SLAVE-UPDATES + REPLICATE-WILD-IGNORE-TABLE FAILS FOR USER VARIABLES · daa3ab6f
      Nuno Carvalho authored
      Fixed possible uninitialized variable.
      daa3ab6f
    • Sujatha Sivakumar's avatar
      Merge from mysql-5.1 to mysql-5.5 · ad145643
      Sujatha Sivakumar authored
      ad145643
    • Sujatha Sivakumar's avatar
      Bug#11829838: ALTER TABLE NOT BINLOGGED WITH · 5745b67e
      Sujatha Sivakumar authored
      --BINLOG-IGNORE-DB AND FULLY QUALIFIED TABLE
            
      Problem:
      =======
      An ALTER TABLE statement is not written to binlog if server
      started with "--binlog-ignore-db some database" and 'fully
      qualified' table names are used in the ALTER TABLE statement
      altering table different from current database context.
            
      Analysis:
      ========
      The above mentioned problem not only affects "ALTER TABLE"
      statements but also to all kind of statements. Once the 
      current default database becomes "NULL" none of the 
      statements will be binlogged.
            
      The current behaviour is such that if the user has specified
      restrictions on which database needs to be replicated and the
      default db is not specified, then do not replicate.
      This means that "NULL" is considered to be equivalent to
      everything (default db = null implied ignore don't log the
      statement).
            
      Fix:
      ===
      "NULL" should not be considered as equivalent to everything.
      Since the filtering criteria is not equal to "NULL" the
      statement should be logged into binlog.
      5745b67e
  2. 26 Mar, 2013 7 commits
    • Andrei Elkin's avatar
      merge from 5.1->5.5 repo. · 2e876a7a
      Andrei Elkin authored
      2e876a7a
    • Andrei Elkin's avatar
      merge from 5.1 repo. · cf23bb76
      Andrei Elkin authored
      cf23bb76
    • mysql-builder@oracle.com's avatar
      No commit message · 3d3abedc
      mysql-builder@oracle.com authored
      No commit message
      3d3abedc
    • Andrei Elkin's avatar
      merge from 5.1 · fd434bca
      Andrei Elkin authored
      fd434bca
    • Andrei Elkin's avatar
      Bug#16541422 LOG-SLAVE-UPDATES + REPLICATE-WILD-IGNORE-TABLE FAILS FOR USER VARIABLES · 0a31d4f4
      Andrei Elkin authored
      At logging a first Query referring a user var, the slave missed to log the user var.
      It appears that at execution of a Uservar event the slaver applier
      thought of the variable as already logged.
      The reason of misjudgement is in coincidence of query id:s: of one that the thread
      holds at Uservar execution and another one that the thread sees at the Query applying.
      While the two are naturally different in the regular execution branch (as two computational
      events are separated as individual events), in the deferred applying case the User var execution
      effectively belongs to its Query processing.
      
      Fixed with storing the Uservar parsing time (where desicion to defer is taken) query id 
      to temporarily substitute with it the actual query id at the Uservar execution time
      (along with its query).
      Such manipulation mimics behaviour of the regular applying branch.
      0a31d4f4
    • Tor Didriksen's avatar
      NULL merge 5.1 => 5.5 · 5bfb832c
      Tor Didriksen authored
      5bfb832c
    • Tor Didriksen's avatar
      Bug#62856 Check for "stack overrun" doesn't work with gcc-4.6, server crashes · d9ccd370
      Tor Didriksen authored
      Bug#13243248 CHECK FOR "STACK OVERRUN" DOESN'T WORK WITH GCC-4.6, SERVER CRASHES
      
      The existing check for stack direction may give wrong results
      for new versions of gcc at high optimization levels.
      
      Solution: Backport the stack-direction check from 5.5
      d9ccd370
  3. 25 Mar, 2013 1 commit
    • Manish Kumar's avatar
      BUG#16438800 - SLAVE_MAX_ALLOWED_PACKET NOT HONORED ON SLAVE IO CONNECT · 142fbb9e
      Manish Kumar authored
            
      Problem - When the slave was disconnected from the master, under certain 
                conditions, upon reconnect, it will report that it received a 
                packet larger the slave_max_allowed_packet which causes the
                replication to stop.
       
      Analysis -The reason of this failure is that on reconnect
                the slave sets the max_allowed_packet from the master's mi->mysql
                object which keeps the max_allowed_packet as 1MB. This causes the 
                slave to report such error on recieving packet bigger than 1MB. 
                START SLAVE on the slave fixes the problem since it restarts
                slave threads which initializes the max_allowed_packet to
                slave_max_allowed_packet.
            
      Fix - The problem is fixed by some code refactoring and introduction of a new
            function which updates the max_allowed_packet for the THD object of the
            slave thread and the mysql->options max_allowed_packet.
      142fbb9e
  4. 22 Mar, 2013 5 commits
  5. 21 Mar, 2013 4 commits
    • Nirbhay Choubey's avatar
      27bce2a2
    • Nirbhay Choubey's avatar
      Bug#12671635 HELP-TABLEFORMAT DOESN'T MATCH HELP-FILES · f8f88bee
      Nirbhay Choubey authored
      As current size limit of 'url' field of help_topic
      table is no longer sufficient for the contents of
      the fill_help_tables-5.1.sql. So, loading the contents
      in the table might result in warning (or error with
      stricter modes).
      
      Updated the type for 'url' field of help_topic as well
      as help_category tables from char(128) to text.
      f8f88bee
    • Nirbhay Choubey's avatar
      Bug#16500013 : ADD VERSION CHECK TO MYSQL_UPGRADE · f5b4c8f1
      Nirbhay Choubey authored
      (Based on Sinisa's patch)
      
      Added a version checking facility to mysql_upgrade.
      The versions used for checking is the version of the
      server that mysql_upgrade is going to upgrade and the
      server version that mysql_upgrade was build/distributed
      with.
      Also added an option '--version-check' to enable/disable
      the version checking.
      f5b4c8f1
    • Annamalai Gurusami's avatar
      Bug #16051728 SERVER CRASHES IN ADD_IDENTIFIER ON CONCURRENT ALTER TABLE AND · 63dc91d7
      Annamalai Gurusami authored
      SHOW ENGINE INNOD
      
      Problem:
      
      The purpose of explain_filename() is to provide useful additional
      information regarding the partitions given the filename.  This function
      was returning an error when it was not able to parse the given filename.
      For example, within InnoDB, temporary files are created with #sql-
      prefix.  But this function was not able to parse it correctly.
      
      Solution:
      
      It is not an error, if explain_filename() could not parse the given
      filename.  If there is no partition information to explain, then silently
      return from the function.
      
      rb#1940 approved by mattiasj
      63dc91d7
  6. 20 Mar, 2013 3 commits
  7. 19 Mar, 2013 1 commit
  8. 20 Mar, 2013 1 commit
    • Jorgen Loland's avatar
      Bug#16394084: LOOSE INDEX SCAN WITH QUOTED INT PREDICATE · 015c320a
      Jorgen Loland authored
                    RETURNS RANDOM DATA
                       
      MySQL 5.5 specific version of bugfix.
            
      When Loose Index Scan Range access is used, MySQL execution needs
      to copy non-aggregated fields. end_send() checked if this was
      necessary by checking if join_tab->select->quick had type
      QS_TYPE_GROUP_MIN_MAX.
            
      In this bug, however, MySQL created a sort index to sort the rows
      read from this range access method. create_sort_index() deletes
      join_tab->select->quick which makes it impossible to inquire
      the join_tab if LIS has been used.
            
      The fix for MySQL 5.5 is to introduce a variable in JOIN_TAB
      that stores whether or not LIS has been used. There is no need
      for this variable in later MySQL versions because the relevant
      code has been refactored.
      015c320a
  9. 19 Mar, 2013 5 commits
  10. 18 Mar, 2013 1 commit
    • Vasil Dimov's avatar
      Fix Bug#16400412 UNNECESSARY DICT_UPDATE_STATISTICS DURING CONCURRENT · 90b3eefb
      Vasil Dimov authored
      UPDATES
      
      After checking that the table has changed too much in
      row_update_statistics_if_needed() and calling dict_update_statistics(),
      also check if the same condition holds after acquiring the table stats
      latch. This is to avoid multiple threads concurrently entering and
      executing the stats update code.
      
      Approved by:	Marko (rb:2186)
      90b3eefb
  11. 19 Mar, 2013 2 commits
  12. 18 Mar, 2013 4 commits
    • Sujatha Sivakumar's avatar
      merge from mysql-5.1 to mysql-5.5 · c4837b36
      Sujatha Sivakumar authored
      c4837b36
    • Sujatha Sivakumar's avatar
      Bug#14771299 OUT-OF-BOUND READS WRITE IN MYSQLBINLOG · ddc0cff3
      Sujatha Sivakumar authored
      Problem:
      =======
      Found using AddressSanitizer testing.
      
      The mysqlbinlog utility may result in out-of-bound heap
      buffer reads and thus, undefined behaviour, when processing
      RBR events in the old (pre-5.1 GA) format.
      
      The following code in process_event() would only be correct
      if Rows_log_event was the base class for
      Write,Update,Delete_rows_log_event_old classes:
      
          case PRE_GA_WRITE_ROWS_EVENT:
          case PRE_GA_DELETE_ROWS_EVENT:
          case PRE_GA_UPDATE_ROWS_EVENT:
      ...
              Rows_log_event *e= (Rows_log_event*) ev;
              Table_map_log_event *ignored_map=
                print_event_info->m_table_map_ignored.get_table(e->get_table_id());
      ...
              if (e->get_flags(Rows_log_event::STMT_END_F))
              {
      ...
              }
      
      However, Rows_log_event is only the base class for the
      Write,Update_Delete_rows_event family of classes, but not
      for their *_old counterparts. So the above typecasts are
      incorrect for the old-format RBR events and may result (and
      do result according to AddressSanitizer reports) in reading
      memory outside of the previously allocated on heap buffer.
      
      Fix:
      ===
      The above mentioned invalid type cast has been replaced with
      appropriate old counterpart.
      
      Note:The above mentioned issue is present only mysql-5.1 and
      5.5. This is fixed in mysql-5.6 and above as part of 
      Bug#55790. Hence few of the relevant changes of Bug#55790 are
      being back ported to fix the current issue.
      ddc0cff3
    • Neeraj Bisht's avatar
      Bug #16076289 : BACKPORT FIX FOR BUG #14786792 TO 5.5 · 913d6e23
      Neeraj Bisht authored
      	
      	Backport the changes for bug#14786792 which is regression 
      	of fix for bug#11761854.So backported both changes.
      913d6e23
    • Nirbhay Choubey's avatar
      fb401ad3