1. 15 Mar, 2011 1 commit
  2. 14 Mar, 2011 5 commits
    • Chuck Bell's avatar
      Local merger for BUG#59752 · d6d4c089
      Chuck Bell authored
      d6d4c089
    • Davi Arnaut's avatar
      Merge of mysql-5.1 into mysql-5.5. · 0bca20e6
      Davi Arnaut authored
      0bca20e6
    • Davi Arnaut's avatar
      Bug#11765202: Dbug_violation_helper::~Dbug_violation_helper(): Assertion `!_entered' failed. · 8da2b4f5
      Davi Arnaut authored
      Add a missing DBUG_RETURN function test_if_number().
      8da2b4f5
    • Magne Mahre's avatar
      Bug#11858960 - WINDOWS SERVICE FAILING TO START IMMEDIATELY AFTER · 65834031
      Magne Mahre authored
                     INSTALLATION
      
      When starting mysqld as an MS Windows NT service, it crashed 
      with "Error 1067: The process terminated unexpectedly".
      
      The problem is that thread local variables are not allocated
      and initialized properly when started as a service. When the
      server is started as a regular executable, the problem does
      not occur.
      
      Analysis showed that this is a regression after the patch for 
      Bug#11765237/Bug#11763065.   Before, the thread local storage
      was initialized by the call chain:
      win_main->my_basic_init->my_thread_basic_global_init->
      my_thread_init
      
      When the my_init() structure was changed, this initialization
      was moved from win_main to mysqld_main.   When started as
      a service win_main is run in a separate thread, which does
      not have mysqld_main in its call path, so my_thread_init
      is never called for this thread.
      
      Added a call to my_thread_init / my_thread_end in the service
      handler function, which solves the problem.
      65834031
    • Alexander Nozdrin's avatar
      A patch for Bug#11765297 (58251 - archive_plugin and blackhole_plugin · 42e3c5d1
      Alexander Nozdrin authored
      fails when running with ps-protocol).
      
      The problem was that when running in --ps-protocol mode mysqltest.cc
      didn't close created prepared statements. So, the plugins could not be
      unistalled because there was a prepared statement using them.
      
      A fix is to add a dummy statement that forces mysqltest.cc to close
      the last prepared statement (which uses a plugin-defined table).
      42e3c5d1
  3. 11 Mar, 2011 11 commits
  4. 10 Mar, 2011 8 commits
  5. 09 Mar, 2011 5 commits
  6. 08 Mar, 2011 6 commits
    • Bjorn Munch's avatar
      Add extra line after unit test report in MTR · f0e0baea
      Bjorn Munch authored
      f0e0baea
    • Bjorn Munch's avatar
      null upmerge · bfbeeb45
      Bjorn Munch authored
      bfbeeb45
    • Bjorn Munch's avatar
      merge from 5.1 main · 0c98f15a
      Bjorn Munch authored
      0c98f15a
    • Bjorn Munch's avatar
      merge from 5.5 main · 311a3ca0
      Bjorn Munch authored
      311a3ca0
    • Marc Alff's avatar
      Bug#11830755 - UNIT TESTS PFS_INSTR AND PFS_INSTR_CLASS CRASH IN MUTEX CALLS ON WINDOWS · 627707e2
      Marc Alff authored
      Before this fix, two performance schema unit tests crashed on windows.
      
      The problem was a missing initialization to PFS_atomics,
      which caused the crash only for platform not compiled with native atomics.
      
      This fix adds the missing initialization in the unit tests.
      No production code was changed, this is a unit test bug only.
      627707e2
    • Jon Olav Hauglid's avatar
      Bug #11755431 (former 47205) · 984988cf
      Jon Olav Hauglid authored
      MAP 'REPAIR TABLE' TO RECREATE +ANALYZE FOR ENGINES NOT
      SUPPORTING NATIVE REPAIR
      
      Executing 'mysqlcheck --check-upgrade --auto-repair ...' will first issue
      'CHECK TABLE FOR UPGRADE' for all tables in the database in order to check if the
      tables are compatible with the current version of MySQL. Any tables that are
      found incompatible are then upgraded using 'REPAIR TABLE'.
      
      The problem was that some engines (e.g. InnoDB) do not support 'REPAIR TABLE'.
      This caused any such tables to be left incompatible. As a result such tables were
      not properly fixed by the mysql_upgrade tool.
      
      This patch fixes the problem by first changing 'CHECK TABLE FOR UPGRADE' to return
      a different error message if the engine does not support REPAIR. Instead of
      "Table upgrade required. Please do "REPAIR TABLE ..." it will report
      "Table rebuild required. Please do "ALTER TABLE ... FORCE ..."
      
      Second, the patch changes mysqlcheck to do 'ALTER TABLE ... FORCE' instead of
      'REPAIR TABLE' in these cases.
      
      This patch also fixes 'ALTER TABLE ... FORCE' to actually rebuild the table.
      This change should be reflected in the documentation. Before this patch,
      'ALTER TABLE ... FORCE' was unused (See Bug#11746162)
      
      Test case added to mysqlcheck.test
      984988cf
  7. 07 Mar, 2011 2 commits
    • Jon Olav Hauglid's avatar
      Bug #11784056 ENABLE CONCURRENT READS WHILE CREATING · c171d99d
      Jon Olav Hauglid authored
                    NON-PRIMARY UNIQUE INDEX USING INNODB
      
      This patch adds the HA_INPLACE_ADD_UNIQUE_INDEX_NO_WRITE
      capability flag to InnoDB, indicating that concurrent reads
      can be allowed while non-primary unique indexes are created.
      
      This is an follow-up to Bug #11751388 which enabled concurrent
      reads when creating non-primary non-unique indexes.
      
      Test case added to innodb_mysql_sync.test.
      c171d99d
    • Jon Olav Hauglid's avatar
      Bug #11764779 (former 57649) · c2dc4b02
      Jon Olav Hauglid authored
      FLUSH TABLES under FLUSH TABLES <list> WITH READ LOCK leads 
      to assert failure.
      
      This assert was triggered if a statement tried up upgrade a metadata
      lock with an active FLUSH TABLE <list> WITH READ LOCK. The assert 
      checks that the connection already holds a global intention exclusive
      metadata lock. However, FLUSH TABLE <list> WITH READ LOCK does not
      acquire this lock in order to be compatible with FLUSH TABLES WITH
      READ LOCK. Therefore any metadata lock upgrade caused the assert to
      be triggered.
      
      This patch fixes the problem by preventing metadata lock upgrade
      if the connection has an active FLUSH TABLE <list> WITH READ LOCK.
      ER_TABLE_NOT_LOCKED_FOR_WRITE will instead be reported to the client.
      
      Test case added to flush.test.
      c2dc4b02
  8. 04 Mar, 2011 2 commits
    • Alexander Barkov's avatar
      Bug#11764503 (Bug#57341) Query in EXPLAIN EXTENDED shows wrong characters · e5fdeac0
      Alexander Barkov authored
        @ mysql-test/r/ctype_latin1.result
        @ mysql-test/r/ctype_utf8.result
        @ mysql-test/t/ctype_latin1.test
        @ mysql-test/t/ctype_utf8.test
        Adding tests
      
        @ sql/mysqld.h
        @ sql/item.cc
        @ sql/sql_parse.cc
        @ sql/sql_view.cc
      
        Refactoring (thanks to Guilhem for the idea):
      
        Item_string::print() was hard to understand because of the different
        QT_ constants: in "query_type==QT_x", QT_x is explicitely included
        but the other two QT_ are implicitely excluded. The combinations
        with '||' and '&&' make this even harder.
        - logic is now more "explicit" by changing QT_ constants to a bitmap of flags:
          QT_ORDINARY: no change,
          QT_IS -> QT_TO_SYSTEM_CHARSET | QT_WITHOUT_INTRODUCERS,
          QT_EXPLAIN -> QT_TO_SYSTEM_CHARSET
          (QT_EXPLAIN was introduced in the first version of the Bug#57341 patch)
        - Item_string::print() is rewritten using those flags
      
        Bugfix itself:
      
        When QT_TO_SYSTEM_CHARSET is used alone (with no QT_WITHOUT_INTRODUCERS),
        we print string literals as follows:
      
        - display introducers if they were in the original query
        - print ASCII characters as is
        - print non-ASCII characters using hex-escape
        Note: as "EXPLAIN" output is only for human readability purposes
        and does not need to be a pasrable SQL, so using hex-escape is Ok.
        ErrConvString class perfectly suites for hex escaping purposes.
      e5fdeac0
    • Nirbhay Choubey's avatar
      BUG#11766219 : 59280: $MYSQL_HOME IS NOT USED FOR THE · c614ff3a
      Nirbhay Choubey authored
                     CLIENT CONFIGURATION.
      
      At startup, MySQL server/client programs do not read
      configuration file pointed by MYSQL_HOME environment
      variable.
      
      This happened as, this environment variable was
      handled by a different variable (DEFAULT_HOME_ENV)
      in the code, which was ne'er initialized.
      
      Fixed by changing it to MYSQL_HOME.
      c614ff3a