1. 24 Feb, 2009 16 commits
    • Alexey Botchkov's avatar
      merging. · e641a297
      Alexey Botchkov authored
      e641a297
    • Alexey Botchkov's avatar
      merging. · a34bb2b8
      Alexey Botchkov authored
      a34bb2b8
    • Alexey Botchkov's avatar
      merging. · f94eafb2
      Alexey Botchkov authored
      f94eafb2
    • Alexey Botchkov's avatar
      merging. · 5a7d6382
      Alexey Botchkov authored
      5a7d6382
    • Chad MILLER's avatar
      Null-merge 39370 fix. Unnecessary in 5.1. · 58cb9641
      Chad MILLER authored
      58cb9641
    • Chad MILLER's avatar
      Merge bug 39370 fix from bug tree. · e2eed1c5
      Chad MILLER authored
      e2eed1c5
    • Chad MILLER's avatar
      Bug#39370: wrong output for error code 153 · 00aa5ad5
      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.
      00aa5ad5
    • Davi Arnaut's avatar
      Bug#41110: crash with handler command when used concurrently with alter table · e4f47653
      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.
      e4f47653
    • Davi Arnaut's avatar
      Bug#41110: crash with handler command when used concurrently with alter table · 11b20f27
      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.
      11b20f27
    • Tatiana A. Nurnberg's avatar
      automerge · 87fcb23d
      Tatiana A. Nurnberg authored
      87fcb23d
    • Tatiana A. Nurnberg's avatar
      automerge · 982f88fc
      Tatiana A. Nurnberg authored
      982f88fc
    • Tatiana A. Nurnberg's avatar
      automerge · 565660ed
      Tatiana A. Nurnberg authored
      565660ed
    • Tatiana A. Nurnberg's avatar
      automerge · 491db675
      Tatiana A. Nurnberg authored
      491db675
    • Tatiana A. Nurnberg's avatar
      automerge · 7efa0aa7
      Tatiana A. Nurnberg authored
      7efa0aa7
    • Tatiana A. Nurnberg's avatar
      automerge · 7a264c73
      Tatiana A. Nurnberg authored
      7a264c73
    • Tatiana A. Nurnberg's avatar
      automerge · 14a63ece
      Tatiana A. Nurnberg authored
      14a63ece
  2. 23 Feb, 2009 12 commits
    • Alexey Kopytov's avatar
      144763db
    • Alexey Kopytov's avatar
      Automerge. · c893a5f0
      Alexey Kopytov authored
      c893a5f0
    • Alexey Kopytov's avatar
      Automerge. · d86c8af3
      Alexey Kopytov authored
      d86c8af3
    • Alexey Kopytov's avatar
      Manual merge to 5.1. · 8ae81624
      Alexey Kopytov authored
      8ae81624
    • Alexey Kopytov's avatar
      Fix for bug #15936: "round" differs on Windows to Unix · 0e62c9aa
      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().
      0e62c9aa
    • Tatiana A. Nurnberg's avatar
      auto-merge · ec3decf6
      Tatiana A. Nurnberg authored
      ec3decf6
    • Tatiana A. Nurnberg's avatar
      auto-merge · c1d73f33
      Tatiana A. Nurnberg authored
      c1d73f33
    • Anurag Shekhar's avatar
      merging with changes in bugteam branch. · e6babb70
      Anurag Shekhar authored
      e6babb70
    • Leonard Zhou's avatar
      merge · 8f3f7992
      Leonard Zhou authored
      8f3f7992
    • Leonard Zhou's avatar
      merge · 2b3dfbc1
      Leonard Zhou authored
      2b3dfbc1
    • Davi Arnaut's avatar
      Post-merge fix: test depends on feature not available under embedded. · 9fc083bd
      Davi Arnaut authored
      mysql-test/t/query_cache_28249.test:
        Test depends on process state (not updated under embedded)
      9fc083bd
    • Leonard Zhou's avatar
      Bug#40013 mixed replication: row based format could lead to stale tmp tables on the · 61d706a4
      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.
      61d706a4
  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 · d822ab89
      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.
      d822ab89
  5. 20 Feb, 2009 10 commits