1. 04 May, 2006 17 commits
  2. 03 May, 2006 22 commits
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5cefbe59
      unknown authored
      into  production.mysql.com:/usersnfs/svojtovich/mysql-5.0
      
      
      5cefbe59
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 46e54f24
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.mrg
      
      
      sql/sql_table.cc:
        Auto merged
      46e54f24
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · b5732e7c
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50
      
      
      mysql-test/r/ndb_blob.result:
        Auto merged
      mysql-test/t/ndb_blob.test:
        Auto merged
      ndb/include/kernel/signaldata/TcKeyReq.hpp:
        Auto merged
      ndb/include/ndbapi/NdbBlob.hpp:
        Auto merged
      ndb/src/ndbapi/NdbBlob.cpp:
        Auto merged
      ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      ndb/tools/delete_all.cpp:
        nuts
      b5732e7c
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b0ecf704
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521
      
      
      b0ecf704
    • unknown's avatar
      Applied innodb-5.0-ss521 snapshot. · 861b68de
      unknown authored
       Fixed BUG#19366: "consistent_snapshot.test fails".
      
      
      innobase/include/dict0dict.ic:
        Applied innodb-5.0-ss521 snapshot.
         Remove too strict assertions from some dict_table_t
         accessor functions (bug #19366).
      861b68de
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 99c42304
      unknown authored
      into mysql.com:/home/hf/work/mysql-4.1.mrg
      
      
      99c42304
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6b02ec1c
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-4.1-ss26
      
      
      6b02ec1c
    • unknown's avatar
      Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss26-work · 34fdbcbf
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
       Null-merge.
      
      
      innobase/include/dict0dict.ic:
        Null-merge.
      34fdbcbf
    • unknown's avatar
      Applied innodb-4.1-ss26 snapshot. · 219d5cf2
      unknown authored
       Fixed BUG#19366: "consistent_snapshot.test fails".
      
      
      innobase/include/dict0dict.ic:
        Applied innodb-4.1-ss26 snapshot.
         Remove too strict assertions from some dict_table_t
         accessor functions (Bug#19366).
      219d5cf2
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · f0c693cc
      unknown authored
      into mysql.com:/home/hf/work/mysql-4.1.mrg
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      f0c693cc
    • unknown's avatar
      merging fix · a1e9539b
      unknown authored
      a1e9539b
    • unknown's avatar
      merging fix · 66edfe28
      unknown authored
      66edfe28
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-5.0.18455 · 7d121a7f
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.mrg
      
      
      7d121a7f
    • unknown's avatar
      merging · 2304a588
      unknown authored
      
      mysql-test/t/sp_notembedded.test:
        Auto merged
      2304a588
    • unknown's avatar
      merging · 83c8e2c9
      unknown authored
      
      sql/handler.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      83c8e2c9
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f1cc138
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
      
      
      7f1cc138
    • unknown's avatar
      Merge april.(none):/home/svoj/devel/mysql/BUG18160/mysql-5.0 · 8cec2f3e
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
      
      
      8cec2f3e
    • unknown's avatar
      merging · 0a9c02f1
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/analyze.result:
        Auto merged
      mysql-test/t/analyze.test:
        Auto merged
      mysql-test/t/mysql_client_test.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      0a9c02f1
    • unknown's avatar
      Merge hf@192.168.21.28:work/mysql-4.1.16892 · 050a9f3f
      unknown authored
      into mysql.com:/home/hf/work/mysql-4.1.mrg
      
      
      050a9f3f
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-4.1.15442 · f4c6c0ed
      unknown authored
      into mysql.com:/home/hf/work/mysql-4.1.mrg
      
      
      f4c6c0ed
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-4.1.15225 · bb95643f
      unknown authored
      into mysql.com:/home/hf/work/mysql-4.1.mrg
      
      
      sql/sql_table.cc:
        Auto merged
      bb95643f
    • unknown's avatar
      Fixed bug #14292: performance degradation for a benchmark query. · 21d61c2b
      unknown authored
      This performance degradation was due to the fact that some
      cost evaluation code added into 4.1 in the function find_best was
      not merged into the code of the function best_access_path added
      together with other code for greedy optimizer.
      Added a parameter to the function print_plan. The parameter contains
      accumulated cost for a given partial join.
       
      The patch does not include a special test case since this performance
      degradation is hard to reproduse with a simple example.
      
      TODO: make the function find_best use the function best_access_path
      in order to remove duplication of code which might result in incomplete
      merges in the future.
      
      
      mysql-test/r/delete.result:
        Fixed bug #14292: performance degradation for a benchmark query.
        Adjusted test results.
      mysql-test/r/subselect.result:
        Fixed bug #14292: performance degradation for a benchmark query.
        Adjusted test results.
      sql/mysql_priv.h:
        Fixed bug #14292: performance degradation for a benchmark query.
        Added a parameter to the function print_plan. The parameter contains
        accumulated cost for a given partial join.
      sql/sql_select.cc:
        Fixed bug #14292: performance degradation for a benchmark query.
        This performance degradation was due to the fact that some
        cost evaluation code added into 4.1 in the function find_best was
        not merged into the code of the function best_access_path added
        together with other code for greedy optimizer.
      sql/sql_test.cc:
        Fixed bug #14292: performance degradation for a benchmark query.
        Added a parameter to the function print_plan. The parameter contains
        accumulated cost for a given partial join.
      21d61c2b
  3. 02 May, 2006 1 commit