1. 15 Mar, 2011 4 commits
    • Dmitry Shulga's avatar
      Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial · 10f5982e
      Dmitry Shulga authored
      of service in prepared statements).
      10f5982e
    • Dmitry Shulga's avatar
      Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". · 6c2f5e30
      Dmitry Shulga authored
      The problem was that server didn't check resulting size of prepared
      statement argument which was set using mysql_send_long_data() API.
      By calling mysql_send_long_data() several times it was possible
      to create overly big string and thus force server to allocate
      memory for it. There was no way to limit this allocation.
      
      The solution is to add check for size of result string against
      value of max_long_data_size start-up parameter. When intermediate
      string exceeds max_long_data_size value an appropriate error message
      is emitted.
      
      We can't use existing max_allowed_packet parameter for this purpose
      since its value is limited by 1GB and therefore using it as a limit
      for data set through mysql_send_long_data() API would have been an
      incompatible change. Newly introduced max_long_data_size parameter
      gets value from max_allowed_packet parameter unless its value is
      specified explicitly. This new parameter is marked as deprecated
      and will be eventually replaced by max_allowed_packet parameter.
      Value of max_long_data_size parameter can be set only at server
      startup.
      6c2f5e30
    • Jon Olav Hauglid's avatar
      Bug #11765416 (former 58381) · 14df359b
      Jon Olav Hauglid authored
      FAILED DROP DATABASE CAN BREAK STATEMENT BASED REPLICATION
      
      The first phase of DROP DATABASE is to delete the tables in the database.
      If deletion of one or more of the tables fail (e.g. due to a FOREIGN KEY
      constraint), DROP DATABASE will be aborted. However, some tables could
      still have been deleted. The problem was that nothing would be written
      to the binary log in this case, so any slaves would not delete these tables.
      Therefore the master and the slaves would get out of sync.
      
      This patch fixes the problem by making sure that DROP TABLE is written
      to the binary log for the tables that were in fact deleted by the failed
      DROP DATABASE statement.
      
      Test case added to binlog.binlog_database.test.
      14df359b
    • Bjorn Munch's avatar
  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 1 commit
    • 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