1. 05 Nov, 2009 1 commit
  2. 04 Nov, 2009 6 commits
    • Magne Mahre's avatar
      BUG #8368 "mysqldump needs --slave-data option" · a5ab2c30
      Magne Mahre authored
        
      Added this option, named as "--dump-slave". The purpose of this option is to be
      able to produce a dump from a slave used for making backups of the master. Originally,
      dumping from the main master was fine, but as more data accumulated, the dump process
      would take over 30 minutes, locking up the master database hence website for 30 minutes.
      A slave dedicated to producing backups was the answer, but I needed a dump that could be
      
      used to restore a slave instantly and in order to do that, it has to have three things 
      contained in the dump:
        
        1. "STOP SLAVE;" at the beginning
        2. "CHANGE MASTER TO ...<the master - info from 'show slave status'>"
        3. "START SLAVE;" at the end
        
      These options in this changeset contain this.
        
        --stop-slave adds "STOP SLAVE" to the beginning of the dump and "STOP SLAVE" 
        to the end of the dump.
        
        --include-host gives the user the option to have the host explicitely added
        to the "CHANGE MASTER TO ..." line.
        
        --dump-slave adds the "CHANGE MASTER ..." to the dump representing not the slave's
        master binlog info, but the slave's master's info from "SHOW SLAVE STATUS" 
      
      
      client/client_priv.h:
        Added OPT_SLAVE_DATA to client_priv.h
      client/mysqldump.c:
        * Added --dump-slave option (name per Brian)
        * Added --stop-slave to print "STOP SLAVE;" into the dump
        * Added --include-host option to include "MASTER_HOST=..." and "MASTER_PORT=..."
          to the dump since unlike --master-data, the host can't be assumed to be
          the local host
        * Added do_start_slave and do_stop_slave to stop the slave sql thread upon
          start of the dump process, and to start the slave sql upon finish of dump process -
          to keep the log information frozen during this time.
        * Added do_show_slave_status for obtaining slave information needed to compose 
          "CHANGE MASTER ..." output to the master of this slave.
        * Added necessary long options and defines required for new options
      a5ab2c30
    • Magne Mahre's avatar
      Bug#26780: automatic vertical output for wide results · 77b8e5d9
      Magne Mahre authored
        
      Feature from Eric Bergen, CLA signed 2007-06-27.
        
      Adds new mysql client option "--auto-vertical-output", which causes
      the client to test whether a result table is too wide for the current
      window (where available) and emit vertical results in that case.
      Otherwise, it sends normal tabular results.
      
      
      client/client_priv.h:
        Add another enum value to client options, for automatic vertical output.
      client/mysql.cc:
        Add another command-line option, "auto-vertical-output".
            
        Add functions to get the terminal width and functions to get the widths of fields.
            
        Use them together to emit vertical output when some output table is too wide to
        fit in the terminal.  If the terminal doesn't support reading its width, then assume
        80-positions wide.
      mysql-test/r/mysql.result:
        Show that various select statements do work as expected.  Wide tables become vertical
        and narrow ones do not.
      mysql-test/t/mysql.test:
        Show that various select statements do work as expected.
            
        These should be suitable for a wide range of window capabilities and sizes.  Under
        extreme circumstances, the results could be arbitrary.
      77b8e5d9
    • Jon Olav Hauglid's avatar
      Bug #43867 ALTER TABLE on a partitioned table causes unnecessary · 17a6040f
      Jon Olav Hauglid authored
                 deadlocks
      
      Backport of revno: 2617.68.35
      
      The problem was that if one connection is running a multi-statement 
      transaction which involves a single partitioned table, and another 
      connection attempts to alter the table to drop a non-existing partition,
      (which of course will fail), the first connection still gets 
      ER_LOCK_DEADLOCK and cannot proceed anymore.
      
      This bug is no longer reproducable. This has also been tested with the
      patch for Bug#46654 "False deadlock on concurrent DML/DDL with partitions, 
      inconsistent behavior" which concerned a similar problem but where the 
      ALTER TABLE is semantically correct.
      
      Test case added in partition_sync.test.
      17a6040f
    • Magne Mahre's avatar
      Bug#42664: Sign ignored for TIME types when not comparing as longlong · a5d74eb1
      Magne Mahre authored
            
      Another code-path dropped sign of TIME, presuming all time is positive.
            
      Minds sign now. Patch depends on ChangeSet for 42661.
      
      
      mysql-test/r/type_time.result:
        Show we now no longer ignore sign of TIME-type
        in this code-path.
      mysql-test/t/type_time.test:
        Show we now no longer ignore sign of TIME-type
        in this code-path.
      sql/item_cmpfunc.cc:
        TIME_to_ulonglong() (somewhat obviously) loses sign
        of its argument, so we put it back in where needed.
      a5d74eb1
    • Magne Mahre's avatar
      Backport to 5.6.0 · 6f541851
      Magne Mahre authored
      6f541851
    • Magne Mahre's avatar
      Bug#42661: sec_to_time() and signedness · 9c5a8637
      Magne Mahre authored
      Bug#42662: maketime() and signedness
            
      Item_time_typecast::val_int() dropped sign from
      MYSQL_TIME gotten using from get_time().
            
      Propagates sign now.
      
      
      Backported to 5.5.0  (6.0-codebase revid: 1810.3897.1)
      9c5a8637
  3. 03 Nov, 2009 2 commits
    • Magne Mahre's avatar
      Bug #36466: Adding days to day_microsecond changes interpretation of microseco · 5388fbae
      Magne Mahre authored
            
      When less than six places are given for microseconds, we zerofill from
      the right (leftmost place is always 1/10s). We only did this when all
      announced date/time fields were given; now we also format fractional
      seconds when more significant fields are left out.
      
      
      mysql-test/r/func_time.result:
        show that we treat fractions of seconds correctly (zerofill from
        right to six places) even if we left out fields on the left
      mysql-test/t/func_time.test:
        show that we treat fractions of seconds correctly (zerofill from
        right to six places) even if we left out fields on the left
      sql/item_timefunc.cc:
        format fractions of seconds even if announced
        more significant fields were left out
      5388fbae
    • Magne Mahre's avatar
      Bug#35224: mysqldump --help is very confusing · 0dae88ca
      Magne Mahre authored
        
      The presence of "--skip" parameters is obscure, when it should be
      obvious from the text.
        
      Now, for boolean options, when they're default to ON and the --skip
      is more useful parameter, then tell the user of its existence.
      
      Backported from 6.0-codebase, revid  2572.14.1
      0dae88ca
  4. 02 Nov, 2009 2 commits
    • Alexander Nozdrin's avatar
      Backport a patch from 6.0: · c5022793
      Alexander Nozdrin authored
      ```---------------------------------------------------------
      revno: 2599.178.12
      revision-id: alik@mysql.com-20080812161845-we7cx9f22yrghob1
      committer: Alexander Nozdrin <alik@mysql.com>
      branch nick: 6.0-rt-build
      timestamp: Tue 2008-08-12 20:18:45 +0400
      message:
        Fix memory leak.
      ```
      
      ---------------------------------------------------------
      c5022793
    • Alexander Nozdrin's avatar
      Manual merge from mysql-next-mr. · a708ba65
      Alexander Nozdrin authored
      a708ba65
  5. 31 Oct, 2009 2 commits
  6. 29 Oct, 2009 8 commits
    • Marc Alff's avatar
      Bug#33637 SHOW PROCEDURE CODE/SHOW FUNCTION CODE sp_name gives a syntax error. · 63e732fe
      Marc Alff authored
      Backport for 5.5
      
      In non debug builds, the statements:
      - SHOW PROCEDURE CODE
      - SHOW FUNCTION CODE
      used to fail with a "syntax error", which is misleading.
      
      These statements have been changed to return the following error for non
      debug builds:
      ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you
      need MySQL built with '--with-debug' to have it working
      
      For debug builds (./configure --with-debug), nothing is changed.
      63e732fe
    • Kristofer Pettersson's avatar
      487bfd56
    • Marc Alff's avatar
      Bug#38968 Unused mutex LOCK_bytes_sent, LOCK_bytes_received · afc87e52
      Marc Alff authored
      Backport for 5.5
      afc87e52
    • Marc Alff's avatar
      Local merge · 48a4658d
      Marc Alff authored
      48a4658d
    • Marc Alff's avatar
      Bug#38967 Unused mutex LOCK_Acl · 54b5ef84
      Marc Alff authored
      Backport to 5.5
      54b5ef84
    • Alexander Nozdrin's avatar
      Automerge from mysql-next-mr. · f236f9a9
      Alexander Nozdrin authored
      f236f9a9
    • Kristofer Pettersson's avatar
      Bug#38551 query cache can still consume [very little] cpu time even when it is off. · ddcdacb2
      Kristofer Pettersson authored
            
      When the query cache is disabled, the server shouldn't attempt to take the 
      query cache mutex.
                                   
      By using the command line option --query_cache_type=0, the user can disable
         
      (backport from mysql-pe)
      
      
      mysql-test/t/query_cache_disabled-master.opt:
        * added test case for bug38551
      mysql-test/t/query_cache_disabled.test:
        * added test case for bug38551
      sql/set_var.cc:
        * Added before-trigger to verify that query_cache_type wasn't turned off or on during
        runtime.
      sql/set_var.h:
        * Changed order on how the enumeration is processed. By first projecting the
        character representation of the variable to a temporary integer we can have
        one function instead of two to check if the value is valid.
      sql/share/errmsg-utf8.txt:
        * Added error message for query cache disabled state
      sql/sql_cache.cc:
        * If the query cache is disabled at start up, shorten the execution path and avoid
        grabbing the query cache mutex each time the invalidate interface methods are called.
      sql/sql_cache.h:
        * Added new methods to set the query cache into a disabled state.
      ddcdacb2
    • Alexey Botchkov's avatar
      mysql_upgrade test fixed · eff49de2
      Alexey Botchkov authored
      per-file comments:
        mysql-test/r/mysql_upgrade.result
           result updated
        mysql-test/t/mysql_upgrade.test
           --skip-verbose option added to the call
      eff49de2
  7. 28 Oct, 2009 6 commits
    • Tor Didriksen's avatar
    • Tor Didriksen's avatar
      Bug#48060 Memory leak - Item::val_bool() (item.cc:184) from optimizer_subquery grammar · b2baeed4
      Tor Didriksen authored
      Item_sum::set_aggregator() may be called multiple times during query preparation.
      On subsequent calls: verify that the aggregator type is the same,
      and re-use the existing Aggregator.
      
      
      sql/item_sum.cc:
        In Item_sum::set_aggregator(): re-use existing Aggregator if already set.
        
        Remove some friend declarations, add some accessor functions.
        Cleanup some DBUG_ENTER and DBUG_RETURN code.
      sql/item_sum.h:
        Make some member fields private, add accessors instead.
        Remove some un-necessary friend declarations.
        Remove some default arguments from constructors.
      sql/opt_sum.cc:
        Use accessor functions in Item_sum.
      sql/sql_select.cc:
        Fix mis-spelled DBUG_ENTER text.
        Use accessor functions in Item_sum.
      sql/sql_yacc.yy:
        Use explicit true/false rather than default arguments when constructing
        Item_sum_xxx objects.
      b2baeed4
    • Alexey Botchkov's avatar
      WL#4991 mysql_upgrade --fix-privilege-tables · 36299d59
      Alexey Botchkov authored
         (backport)
         mysql_upgrade script accepts --upgrade-system-tables option,
         fixing only system tables in this case.
      
      per-file comments:
        client/mysql_upgrade.c
      WL#4991 mysql_upgrade --fix-privilege-tables
          --upgrade-system-tables option added.
         if it is set, the tool won't look for the mysqlcheck then
         run_mysqlcheck_fixnames() and run_mysqlcheck_upgrade won't be called.
        mysql-test/r/mysql_upgrade.result
      WL#4991 mysql_upgrade --fix-privilege-tables
          test result added
        mysql-test/t/mysql_upgrade.test
      WL#4991 mysql_upgrade --fix-privilege-tables
          test case added
      36299d59
    • Alexander Nozdrin's avatar
      42cdc4df
    • Alexander Nozdrin's avatar
      Merge from mysql-next-mr. · 22fe8e10
      Alexander Nozdrin authored
      22fe8e10
    • Alexander Nozdrin's avatar
      Automerge from mysql-next-mr. · 55b8f07a
      Alexander Nozdrin authored
      55b8f07a
  8. 27 Oct, 2009 10 commits
  9. 26 Oct, 2009 3 commits
    • Dmitry Lenev's avatar
      Fix for bug #45143 "All connections hang on concurrent ALTER TABLE". · 86c23fa7
      Dmitry Lenev authored
      Concurrent execution of statements which require non-table-level
      write locks on several instances of the same table (such as
      SELECT ... FOR UPDATE which uses same InnoDB table twice or a DML
      statement which invokes trigger which tries to update same InnoDB
      table directly and through stored function) and statements which
      required table-level locks on this table (e.g. LOCK TABLE ... WRITE,
      ALTER TABLE, ...) might have resulted in a deadlock.
      
      The problem occured when a thread tried to acquire write lock
      (TL_WRITE_ALLOW_WRITE) on the table but had to wait since there was
      a pending write lock (TL_WRITE, TL_WRITE_ALLOW_READ) on this table
      and we failed to detect that this thread already had another instance
      of write lock on it (so in fact we were trying to acquire recursive
      lock) because there was also another thread holding write lock on the
      table (also TL_WRITE_ALLOW_WRITE). When the latter thread released
      its lock neither the first thread nor the thread trying to acquire
      TL_WRITE/TL_WRITE_ALLOW_READ were woken up (as table was still write
      locked by the first thread) so we ended up with a deadlock.
      
      This patch solves this problem by ensuring that thread which
      already has write lock on the table won't wait when it tries
      to acquire second write lock on the same table.
      
      mysql-test/r/lock_sync.result:
        Added test case for bug #45143 "All connections hang on concurrent
        ALTER TABLE".
      mysql-test/t/lock_sync.test:
        Added test case for bug #45143 "All connections hang on concurrent
        ALTER TABLE".
      mysys/thr_lock.c:
        Ensured that thread can acquire write lock on the table without
        waiting if it already has write lock on it even if there are other
        threads holding write locks on this table (this is normal situation
        for, e.g., TL_WRITE_ALLOW_WRITE type of lock).
        
        Adjusted comments to better explain why it is OK to do so and added
        asserts to prevent introduction of scenarios in which this can cause
        problems.
      86c23fa7
    • Vladislav Vaintroub's avatar
      Bug #48317 cannot build innodb as static library. · 1dd88254
      Vladislav Vaintroub authored
      The problem here is that the latest innodb push contains
      both MYSQL_STORAGE_ENGINE(INNOBASE) and MYSQL_STORAGE_ENGINE(INNOBASE)
      in the same CMakeLists.txt, to make the resulting library
      ha_innodb.dll, instead of ha_innobase.dll.
      
      Using multiple MYSQL_STORAGE_ENGINE within the same  CMakeLists.txt
      conflicts with the fix for the bug Bug #47795 "CMake, storage engine
      name different from directory name". Top-level CMakeLists.txt now 
      parses storage engine's  CMakeLists.txt to extract engines name from 
      MYSQL_STORAGE_ENGINE().
      
      For innodb, it concludes that there is not storage engine named
      INNOBASE, hence WITH_INNOBASE_STORAGE_ENGINE has no effect.
      
      The fix is to use SET_TARGET_PROPERTIES(... PROPERTIES OUTPUT_NAME ...),
      instead of renaming the engine to have plugins named ha_innodb.dll.
      1dd88254
    • Alexander Barkov's avatar