1. 24 Feb, 2009 16 commits
    • Alexey Botchkov's avatar
      merging. · cde04f67
      Alexey Botchkov authored
      cde04f67
    • Alexey Botchkov's avatar
      merging. · 5f9d6640
      Alexey Botchkov authored
      5f9d6640
    • Alexey Botchkov's avatar
      merging. · 0091ab20
      Alexey Botchkov authored
      0091ab20
    • Alexey Botchkov's avatar
      merging. · 21ba22ac
      Alexey Botchkov authored
      21ba22ac
    • Chad MILLER's avatar
      Null-merge 39370 fix. Unnecessary in 5.1. · 448a1117
      Chad MILLER authored
      448a1117
    • Chad MILLER's avatar
      Merge bug 39370 fix from bug tree. · 8de8f6d5
      Chad MILLER authored
      8de8f6d5
    • Chad MILLER's avatar
      Bug#39370: wrong output for error code 153 · 83aa3e94
      Chad MILLER authored
      Add all HA error numbers and descriptions to perror.
      
      Add reminder to header.
      
      This is already fixed in smarter ways in future codebases, and this 
      codebase is unlikely to change, since new development is forbidden
      here.
      83aa3e94
    • Davi Arnaut's avatar
      Bug#41110: crash with handler command when used concurrently with alter table · 104cf08a
      Davi Arnaut authored
      Bug#41112: crash in mysql_ha_close_table/get_lock_data with alter table
      
      The problem is that the server wasn't handling robustly failures
      to re-open a table during a HANDLER .. READ statement. If the
      table needed to be re-opened due to it's storage engine being
      altered to one that doesn't support HANDLER, a reference (dangling
      pointer) to a closed table could be left in place and accessed in
      later attempts to fetch from the table using the handler. Also,
      if the server failed to set a error message if the re-open
      failed. These problems could lead to server crashes or hangs.
      
      The solution is to remove any references to a closed table and
      to set a error if reopening a table during a HANDLER .. READ
      statement fails.
      
      mysql-test/include/handler.inc:
        Add test case for Bug#41110 and Bug#41112
      mysql-test/r/handler_innodb.result:
        Add test case result for Bug#41110 and Bug#41112
      mysql-test/r/handler_myisam.result:
        Add test case result for Bug#41110 and Bug#41112
      sql/sql_handler.cc:
        Remove redundant reopen check.
        Set errors even if reopening table.
        Reset TABLE_LIST::table reference when the table is closed.
      104cf08a
    • Davi Arnaut's avatar
      Bug#41110: crash with handler command when used concurrently with alter table · 990bca3b
      Davi Arnaut authored
      Bug#41112: crash in mysql_ha_close_table/get_lock_data with alter table
      
      The problem is that the server wasn't handling robustly failures
      to re-open a table during a HANDLER .. READ statement. If the
      table needed to be re-opened due to it's storage engine being
      altered to one that doesn't support HANDLER, a reference (dangling
      pointer) to a closed table could be left in place and accessed in
      later attempts to fetch from the table using the handler. Also,
      if the server failed to set a error message if the re-open
      failed. These problems could lead to server crashes or hangs.
      
      The solution is to remove any references to a closed table and
      to set a error if reopening a table during a HANDLER .. READ
      statement fails.
      
      There is no test case in this change set as the test depends on
      a testing feature only available on 5.1 and later.
      
      sql/sql_handler.cc:
        Remove redundant reopen check.
        Set errors even if reopening table.
        Reset TABLE_LIST::table reference when the table is closed.
      990bca3b
    • Tatiana A. Nurnberg's avatar
      automerge · 2abe57c4
      Tatiana A. Nurnberg authored
      2abe57c4
    • Tatiana A. Nurnberg's avatar
      automerge · 9047f1a0
      Tatiana A. Nurnberg authored
      9047f1a0
    • Tatiana A. Nurnberg's avatar
      automerge · 4c443b0a
      Tatiana A. Nurnberg authored
      4c443b0a
    • Tatiana A. Nurnberg's avatar
      automerge · 3d6963db
      Tatiana A. Nurnberg authored
      3d6963db
    • Tatiana A. Nurnberg's avatar
      automerge · 376e369b
      Tatiana A. Nurnberg authored
      376e369b
    • Tatiana A. Nurnberg's avatar
      automerge · 1703cf9c
      Tatiana A. Nurnberg authored
      1703cf9c
    • Tatiana A. Nurnberg's avatar
      automerge · e8c17219
      Tatiana A. Nurnberg authored
      e8c17219
  2. 23 Feb, 2009 12 commits
    • Alexey Kopytov's avatar
      a8cfa64f
    • Alexey Kopytov's avatar
      Automerge. · ba70c0b6
      Alexey Kopytov authored
      ba70c0b6
    • Alexey Kopytov's avatar
      Automerge. · 301308b7
      Alexey Kopytov authored
      301308b7
    • Alexey Kopytov's avatar
      Manual merge to 5.1. · c718b1d7
      Alexey Kopytov authored
      c718b1d7
    • Alexey Kopytov's avatar
      Fix for bug #15936: "round" differs on Windows to Unix · 1b5d173b
      Alexey Kopytov authored
      Both of our own implementations of rint(3) were inconsistent with the
      most common behavior of rint() on those platforms that have it: round
      to nearest, break ties by rounding to nearest even.
      
      Fixed by leaving just one implementation of rint() in our source tree,
      and changing its behavior to match the most common native
      implementations on other platforms.
      
      configure.in:
        Added checks for fenv.h and fesetround().
      include/config-win.h:
        Removed the incorrect implementation of rint() for Windows.
      include/my_global.h:
        Added an rint() implementation for platforms that do not have it.
      mysql-test/r/func_math.result:
        Added a test case for bug #15936.
      mysql-test/t/func_math.test:
        Added a test case for bug #15936.
      sql/mysqld.cc:
        Explicitly set the FPU rounding mode with fesetround().
      1b5d173b
    • Tatiana A. Nurnberg's avatar
      auto-merge · a97aca4a
      Tatiana A. Nurnberg authored
      a97aca4a
    • Tatiana A. Nurnberg's avatar
      auto-merge · cef3706e
      Tatiana A. Nurnberg authored
      cef3706e
    • Anurag Shekhar's avatar
      merging with changes in bugteam branch. · e91a9167
      Anurag Shekhar authored
      e91a9167
    • Leonard Zhou's avatar
      merge · 8c7b34d1
      Leonard Zhou authored
      8c7b34d1
    • Leonard Zhou's avatar
      merge · fc0c1cca
      Leonard Zhou authored
      fc0c1cca
    • Davi Arnaut's avatar
      Post-merge fix: test depends on feature not available under embedded. · 19cb8641
      Davi Arnaut authored
      mysql-test/t/query_cache_28249.test:
        Test depends on process state (not updated under embedded)
      19cb8641
    • Leonard Zhou's avatar
      Bug#40013 mixed replication: row based format could lead to stale tmp tables on the · ab369861
      Leonard Zhou authored
      slave.
      
      In mixed mode, if we create a temporary table and do some update which switch to ROW format,
      the format will keep in ROW format until the session ends or the table is dropped explicitly. 
      When the session ends, the temp table is dropped automaticly at cleanup time.
      but it checks only current binlog format and so skip insertion of DROP TABLE instructions into binlog.
      So the temp table can't be dropped correctly at slave.
      
      Our solution is that when closing temp tables at cleanup time we check both binlog format and binlog mode,
      and we could write DROP TABLE instructions into binlog if current binlog format is ROW but in MIX mode.
      
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result:
        Test result file.
      mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test:
        Test file.
      sql/sql_base.cc:
        Didn't do binloging when both current format and default format are ROW.
      ab369861
  3. 22 Feb, 2009 1 commit
  4. 21 Feb, 2009 1 commit
    • Alfranio Correia's avatar
      BUG#38174 secure-file-priv breaks LOAD DATA INFILE replication in statement mode · 98502312
      Alfranio Correia authored
                        
      If secure-file-priv was set on slave, it became unable to execute
      LOAD DATA INFILE statements sent from master using mixed or
      statement-based replication.
                        
      This patch fixes the issue by ignoring this security restriction
      and checking if the files are created and read by the slave in the
      --slave-load-tmpdir while executing the SQL Thread.
      98502312
  5. 20 Feb, 2009 10 commits