1. 01 Jun, 2010 10 commits
  2. 31 May, 2010 5 commits
  3. 28 May, 2010 5 commits
  4. 27 May, 2010 9 commits
    • Dmitry Lenev's avatar
      Null-merged the 5.1-only version of fix for bug #46947 · fae1efb5
      Dmitry Lenev authored
      "Embedded SELECT without FOR UPDATE is causing a lock"
      into 5.5 tree. One of 5.5 trees already contains a
      more thorough version of the fix.
      fae1efb5
    • Dmitry Lenev's avatar
      A 5.1-only version of fix for bug #46947 "Embedded SELECT · 78c6a8ca
      Dmitry Lenev authored
      without FOR UPDATE is causing a lock".
      
      SELECT statements with subqueries referencing InnoDB tables
      were acquiring shared locks on rows in these tables when they
      were executed in REPEATABLE-READ mode and with statement or
      mixed mode binary logging turned on.
      
      This was a regression which were introduced when fixing
      bug 39843.
      
      The problem was that for tables belonging to subqueries
      parser set TL_READ_DEFAULT as a lock type. In cases when
      statement/mixed binary logging at open_tables() time this
      type of lock was converted to TL_READ_NO_INSERT lock at
      open_tables() time and caused InnoDB engine to acquire
      shared locks on reads from these tables. Although in some
      cases such behavior was correct (e.g. for subqueries in
      DELETE) in case of SELECT it has caused unnecessary locking.
      
      This patch implements minimal version of the fix for the
      specific problem described in the bug-report which supposed
      to be not too risky for pushing into 5.1 tree.
      The 5.5 tree already contains a more appropriate solution
      which also addresses other related issues like bug 53921
      "Wrong locks for SELECTs used stored functions may lead
      to broken SBR".
      
      This patch tries to solve the problem by ensuring that
      TL_READ_DEFAULT lock which is set in the parser for
      tables participating in subqueries at open_tables()
      time is interpreted as TL_READ_NO_INSERT or TL_READ.
      TL_READ is used only if we know that this is a SELECT
      and that this particular table is not used by a stored
      function.
      
      Test coverage is added for both InnoDB and MyISAM.
      
      This patch introduces an "incompatible" change in locking
      scheme for subqueries used in SELECT ... FOR UPDATE and
      SELECT .. IN SHARE MODE.
      
      In 4.1 (as well as in 5.0 and 5.1 before fix for bug 39843)
      the server would use a snapshot InnoDB read for subqueries
      in SELECT FOR UPDATE and SELECT .. IN SHARE MODE statements,
      regardless of whether the binary log is on or off.
      
      If the user required a different type of read (i.e. locking
      read), he/she could request so explicitly by providing FOR
      UPDATE/IN SHARE MODE clause for each individual subquery.
      
      The patch for bug 39843 broke this behaviour (which was not
      documented or tested), and started to use locking reads for
      all subqueries in SELECT ... FOR UPDATE/IN SHARE MODE.
      This patch restores 4.1 behaviour.
      
      This patch should be mostly null-merged into 5.5 tree.
      78c6a8ca
    • Inaam Rana's avatar
      Fix the printout in for long semaphore waits to not · 063574c3
      Inaam Rana authored
      list a thread doing a wait_ex as an s-lock waiter.
      063574c3
    • Sergey Glukhov's avatar
      mysql-5.1-bugteam->mysql-trunk-merge · d7c73e79
      Sergey Glukhov authored
      d7c73e79
    • Sergey Glukhov's avatar
      Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins · fa3570f9
      Sergey Glukhov authored
      There are two problems:
      1. In simplify_joins function we calculate table dependencies. If STRAIGHT_JOIN hint
      is used for whole SELECT we do not count it and as result some dependendecies
      might be lost. It leads to incorrect table order which is returned by
      join_tab_cmp_straight() function.
      2. make_join_statistics() calculate the transitive closure for relations a particular
      JOIN_TAB is 'dependent on'.
      We aggregate the dependent table_map of a JOIN_TAB by adding dependencies from other
      tables which we depend on. However, this may also cause new dependencies to be
      available after we have completed processing a certain JOIN_TAB.
      Both these problems affect condition pushdown and as result condition might be pushed
      into wrong table which leads to crash or even omitted which leads to wrong result.
      The fix:
      1. Use modified 'transitive closure' algorithm provided by Ole John Aske
      2. Update table dependences in simplify_joins according to 
         global STRAIGHT_JOIN hint.
      Note: the patch also fixes bugs 46091 & 51492
      fa3570f9
    • Alexey Kopytov's avatar
      eaea879d
    • Alexey Kopytov's avatar
      Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. · 17325b8d
      Alexey Kopytov authored
      Null-merged patch for bug 53907.
      
      Conflicts:
      
         conflict      sql/sql_parse.cc
      17325b8d
    • Alexey Kopytov's avatar
      Automerge. · 54a006fa
      Alexey Kopytov authored
      54a006fa
    • Alexey Kopytov's avatar
      Automerge. · b19c8805
      Alexey Kopytov authored
      b19c8805
  5. 26 May, 2010 5 commits
  6. 25 May, 2010 6 commits
    • Ramil Kalimullin's avatar
      Manual merge. · 442e0f01
      Ramil Kalimullin authored
      442e0f01
    • Alexey Kopytov's avatar
      Bug #53830: !table || (!table->read_set || · 8fabbdd7
      Alexey Kopytov authored
                   bitmap_is_set(table->read_set, field_index))
      
      UPDATE on an InnoDB table modifying the same index that is used
      to satisfy the WHERE condition could trigger a debug assertion
      under some circumstances.
      
      Since for engines with the HA_PRIMARY_KEY_IN_READ_INDEX flag
      set results of an index scan on a secondary index are appended
      by the primary key value, if a query involves only columns from
      the primary key and a secondary index, the latter is considered
      to be covering.
      
      That tricks mysql_update() to mark for reading only columns
      from the secondary index when it does an index scan to retrieve
      rows to update in case a part of that key is also being
      updated. However, there may be other columns in WHERE that are
      part of the primary key, but not the secondary one.
      
      What we actually want to do in this case is to add index
      columns to the existing WHERE columns bitmap rather than
      replace it.
      8fabbdd7
    • Vasil Dimov's avatar
      5ae99829
    • Ramil Kalimullin's avatar
      Automerge. · 422621a4
      Ramil Kalimullin authored
      422621a4
    • Ramil Kalimullin's avatar
      Fix for bug #53907: Table dump command can be abused to dump arbitrary tables. · edfea7d5
      Ramil Kalimullin authored
      Problem: one with SELECT privilege on some table may dump other table
      performing COM_TABLE_DUMP command due to missed check of the table name.
      
      Fix: check the table name.
      edfea7d5
    • Mattias Jonsson's avatar
      merge · 427436d4
      Mattias Jonsson authored
      427436d4