1. 20 Feb, 2010 8 commits
  2. 19 Feb, 2010 2 commits
  3. 18 Feb, 2010 4 commits
  4. 17 Feb, 2010 14 commits
    • Magne Mahre's avatar
      Bug#47017 rpl_timezone fails on PB-2 with mismatch error · de554de6
      Magne Mahre authored
      This is a post-fix cleanup to move rpl.rpl_timezone out
      of 'experimental' state.
      de554de6
    • unknown's avatar
      Merge from mysql-5.1.44-release · 0a7b5fb0
      unknown authored
      0a7b5fb0
    • unknown's avatar
      configure.in · 62db6839
      unknown authored
       - Changes to the banner text
       - Use older AC_PROG_LIBTOOL (Bug#51009)
      
      scripts/mysql_install_db.sh
       - Changes to banner text
      62db6839
    • Bjorn Munch's avatar
      Bug #51135 Please increase the maximum number of connections allowed in mysqltest · 90c3ace0
      Bjorn Munch authored
      Added --max-connections= argument to mysqltest and mtr
      Small fix to first patch: forgot to check before free'ing connections array
      90c3ace0
    • Bjorn Munch's avatar
      merge 44054 · b471134b
      Bjorn Munch authored
      b471134b
    • Bjorn Munch's avatar
      merge 44054 · dedad8ae
      Bjorn Munch authored
      dedad8ae
    • Alexander Nozdrin's avatar
      Re-adding 'include/probes_mysql_nodtrace.h' removed by accident · d2af6c43
      Alexander Nozdrin authored
      in 'kostja@sun.com-20091210084103-l4f8u62u4evoy3dc'.
      
      This file is necessary for Windows builds.
      d2af6c43
    • Bjorn Munch's avatar
      Bug #44054 MTR2: --no-reorder does not prevent reordering · 5b7306e2
      Bjorn Munch authored
      Some logic would group by suite always
      Disable this if using --noreorder
      Also fix getting array from collect_one_suite() in this case
      Amended according to previous comment
      5b7306e2
    • Alexey Botchkov's avatar
      Bug#38959 archive_gis fails due to rounding difference · df460f4e
      Alexey Botchkov authored
          Multi_polygon::centroid() has an error in the implementation
            
      per-file messages:
        sql/spatial.cc
      Bug#38959      archive_gis fails due to rounding difference
              multi_polygon::centroid() implementation fixed
      df460f4e
    • Magne Mahre's avatar
      Merge from mysql-trunk-bugfixing · 1191483b
      Magne Mahre authored
      1191483b
    • Bjorn Munch's avatar
      Bug #51248 Server start fails with MTR_VERSION=1 and code with WL5154 · 6e5a6259
      Bjorn Munch authored
      Replaced --default-character-set with --character-set-server
      Replaced --language with --lc-messages-dir
      NB full test suite not tested yet
      6e5a6259
    • Magne Mahre's avatar
      WL#5182 Remove more deprecated 4.1/5.0 features · 68b5c12d
      Magne Mahre authored
      WL#5154 was a task for formally deprecating and removing items that
      were mentioned in the manual as having been deprecated since MySQL
      4.1 or 5.0, but that had never been removed.
      
      Since WL#5154 was created, examination of mysqld.cc, mysql.cc, and
      mysqldump.c reveals additional deprecations not mentioned in the
      manual. (In some cases, the items are simply not mentioned in the
      5.1+ manuals.)
      
      This is a follow-on task to deprecate and remove these additional
      items.
      
      The deprecation happened in MySQL 5.1, and the options/variables
      are now removed from the code.
      
      
      
      client/mysql.cc:
        --no-tee is now removed
      client/mysqldump.c:
        --all is now removed
        -a now points to --create-options
      sql/mysqld.cc:
        delay-key-write-for-all-tables is removed
        --enable-locking is removed
        --log-update is removed
        --skip-locking is removed
        --skip-symlink is removed
        --sql-bin-update-same is removed
        --warnings is removed
        --record-buffer is removed
      68b5c12d
    • Magne Mahre's avatar
      WL#5154 Remove deprecated 4.1 features · 7178879c
      Magne Mahre authored
      A set of program options and variables was deprecated in
      MySQL 5.1, and is hereby removed.
      
      
      
      client/mysql.cc:
        --no-auto-rehash (-A)  is no longer deprecated
        --no-named-commands (-g) is now removed
        --skip-line-numbers (-L) is no longer deprecated
        --set-variable (-O) is now removed
        --no-pager is now removed
      client/mysqlbinlog.cc:
        --position is now removed (use --start-position)
        -j is now equivalent with --start-position
      client/mysqldump.c:
        --first-slave is now removed
        --no-set-names (-N) is now removed
        --set-variable (-O) is now removed
      mysql-test/include/default_mysqld.cnf:
        default-character-set is removed as an option
        character-set-server is equivalent.
      mysql-test/t/bug47671-master.opt:
        default-character-set option is removed
        character-set-server is equivalent
      mysql-test/t/ctype_latin1_de-master.opt:
        default-character-set option is removed
        character-set-server is equivalent
      mysql-test/t/ctype_ucs2_def-master.opt:
        default-collation is removed
        collation-server is equicalent
      scripts/mysqld_multi.sh:
        --config-file has been superseded by
        --defaults-extra-file
      sql/mysql_priv.h:
        Removed the version number in the deprecation
        warning text, as decided by ServerPT.
      sql/mysqld.cc:
        --default-character-set (-C) is removed
        --default-collation is removed
        --log-long-format (-0) is removed
        --safe-show-database is removed
        --set-variable (-O) is removed
      sql/sql_yacc.yy:
        The FRAC_SECOND keyword is removed
      sql/sys_vars.cc:
        The sql_log_update system variable is removed
      7178879c
    • Alexander Barkov's avatar
      Merging from mysql-next-mr · 8780277b
      Alexander Barkov authored
      8780277b
  5. 16 Feb, 2010 7 commits
  6. 15 Feb, 2010 5 commits
    • Konstantin Osipov's avatar
      A fix and a test case for Bug#47648 "main.merge fails sporadically". · 3a856d44
      Konstantin Osipov authored
      If a prepared statement used both a MyISAMMRG table and a stored 
      function or trigger, execution could fail with "No such table"
      error or crash. 
      The error would come from a failure of the MyISAMMRG engine
      to meet the expectations of the prelocking algorithm, 
      in particular maintain lex->query_tables_own_last pointer
      in sync with lex->query_tables_last pointer/the contents
      of lex->query_tables. When adding merge children, the merge
      engine would extend the table list. Then, when adding 
      prelocked tables, the prelocking algorithm would use a pointer
      to the last merge child to assign to lex->query_tables_own_last.
      Then, when merge children were removed at the end of
      open_tables(), lex->query_tables_own_last
      was not updated, and kept pointing
      to a removed merge child.
      
      The fix ensures that query_tables_own_last is always in
      sync with lex->query_tables_last.
      
      This is a regression introduced by WL#4144 and present only
      in next-4284 tree and 6.0.
      
      mysql-test/r/merge.result:
        Update results (Bug#47648).
      mysql-test/t/merge.test:
        Add a test case for Bug#47648.
        Update the result file to reflect a fix of another bug
        in MyISAMMRG code: not maintaining lex->query_tables_own_last
        allowed a stored function or trigger to modify a merge table
        which was already updated by the main statement.
        It is not allowed for other storage engines, and should
        not be allowed for MyISAMMRG.
      storage/myisammrg/ha_myisammrg.cc:
        When adding children to the list of tables to open,
        make sure that we properly set lex->query_tables_own_last.
        When removing the children, update lex->query_tables_own_last
        if necessary.
      3a856d44
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-4284. · c15886a1
      Alexander Nozdrin authored
      c15886a1
    • Dmitry Lenev's avatar
      Fix for bug #51093 "Crash (possibly stack overflow) in · 03672b96
      Dmitry Lenev authored
      MDL_lock::find_deadlock".
      
      On some platforms deadlock detector in metadata locking 
      subsystem under certain conditions might have exhausted
      stack space causing server crashes.
      
      Particularly this caused failures of rqg_mdl_stability
      test on Solaris in PushBuild.
      
      During search for deadlock MDL deadlock detector could 
      sometimes encounter loop in the waiters graph in which 
      MDL_context which has started search for a deadlock 
      does not participate. In such case our algorithm will 
      continue looping assuming that either this deadlock will 
      be resolved by MDL_context which has created it (i.e.
      by one of loop participants) or maximum search depth
      will be reached. 
      Since max search depth was set to 1000 in the latter case 
      on platforms where each iteration of deadlock search 
      algorithm needs more than DEFAULT_STACK_SIZE/1000 bytes 
      of stack (around 192 bytes for 32-bit and around 256 bytes 
      for 64-bit platforms) we might have exhausted stack space.
      
      This patch solves this problem by reducing maximum search
      depth for MDL deadlock detector to 32. This should be safe
      at the moment as it is unlikely that each iteration of the 
      current deadlock detector algorithm will consume more than 
      1K of stack (thus total amount of stack required can't be
      more than 32K) and we require at least 80K of stack in order
      to open any table. Also this value should be (hopefully) big
      enough to not cause too much false deadlock errors (there
      is an anecdotal evidence that real-life deadlocks are
      typically shorter than that).
      
      Additional reasearch should be conducted in future in order
      to determine the more optimal value of maximum search depth.
      
      This patch does not include test case as existing
      rqg_mdl_stability test can serve as one.
      03672b96
    • Jon Olav Hauglid's avatar
      Followup to Bug#45225 Locking: hang if drop table with no timeout · 37fd0bcf
      Jon Olav Hauglid authored
      This patch removes the unused server variable
      "table_lock_wait_timeout".
      
      
      mysql-test/r/variables.result:
        Updated the test for Bug#28580 to reflect that 
        "table_lock_wait_timeout" no longer exists.
      mysql-test/t/variables.test:
        Updated the test for Bug#28580 to reflect that 
        "table_lock_wait_timeout" no longer exists.
      37fd0bcf
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-4284. · cb7078f5
      Alexander Nozdrin authored
      cb7078f5