1. 06 Feb, 2006 6 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 2ba25676
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      2ba25676
    • unknown's avatar
      Fixed bug #16203. · d8c96f28
      unknown authored
      If check_quick_select returns non-empty range then the function cost_group_min_max
      cannot return 0 as an estimate of the number of retrieved records.
      Yet the function erroneously returned 0 as the estimate in some situations.
      
      
      mysql-test/r/group_min_max.result:
        Added a test case for bug #16203.
      mysql-test/t/group_min_max.test:
        Added a test case for bug #16203.
      d8c96f28
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 18aba041
      unknown authored
      into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      18aba041
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 5f2b9f4f
      unknown authored
      into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
      
      
      mysql-test/t/sp-destruct.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      5f2b9f4f
    • unknown's avatar
      Updated sp-code.result after merge (BUG#16568) · 466c30c1
      unknown authored
      
      mysql-test/r/sp-code.result:
        Updated result after merge (BUG#16568)
      466c30c1
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · fa461152
      unknown authored
      into  mysql.com:/extern/mysql/work/bug16568/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      fa461152
  2. 05 Feb, 2006 3 commits
  3. 03 Feb, 2006 9 commits
  4. 02 Feb, 2006 12 commits
    • unknown's avatar
      One more post-merge fix. · 334da85f
      unknown authored
      
      mysql-test/r/heap.result:
        It turns out that I didn't commit one test result (it's identical 
        to 4.1)
      334da85f
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 6a2a94b5
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      sql/sql_select.cc:
        Auto merged
      6a2a94b5
    • unknown's avatar
      Post-merge fixes. · 2fb59bd7
      unknown authored
      2fb59bd7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cf4b6ee4
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      cf4b6ee4
    • unknown's avatar
      item_timefunc.cc: · 86f9bdf8
      unknown authored
        manual adding the fix for bug#15828 which did not automerge
      
      
      sql/item_timefunc.cc:
        manual adding the fix for bug#15828 which did not automerge
      86f9bdf8
    • unknown's avatar
      Merge mysql.com.:/data/BK/mysql-4.1_15828 · d25eaabe
      unknown authored
      into  mysql.com.:/data/BK/mysql-5.0_15828
      
      
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/item_timefunc.cc:
        manually merging fix for bug 15282 - automerge failed as 5.0 was heavely changed
        step one using local for file item_timefunc
      d25eaabe
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · 95a3509a
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      BitKeeper/deleted/.del-rpl_ignore_table.result:
        Delete: mysql-test/r/rpl_ignore_table.result
      BitKeeper/deleted/.del-rpl_multi_update4.result:
        Delete: mysql-test/r/rpl_multi_update4.result
      BitKeeper/deleted/.del-rpl_ignore_table-slave.opt:
        Delete: mysql-test/t/rpl_ignore_table-slave.opt
      BitKeeper/deleted/.del-rpl_ignore_table.test:
        Delete: mysql-test/t/rpl_ignore_table.test
      BitKeeper/deleted/.del-rpl_multi_update4-slave.opt:
        Delete: mysql-test/t/rpl_multi_update4-slave.opt
      BitKeeper/deleted/.del-disabled.def:
        Auto merged
      BitKeeper/deleted/.del-rpl_multi_update4.test:
        Delete: mysql-test/t/rpl_multi_update4.test
      heap/hp_create.c:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/update.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/heap.test:
        Auto merged
      mysql-test/t/kill.test:
        Auto merged
      mysql-test/t/update.test:
        Auto merged
      ndb/include/mgmapi/mgmapi_config_parameters.h:
        Auto merged
      ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      configure.in:
        Manual merge.
      libmysql/libmysql.c:
        Manual merge.
      mysql-test/r/heap.result:
        Manual merge.
      mysql-test/r/heap_hash.result:
        Manual merge.
      mysql-test/r/kill.result:
        Manual merge.
      sql/ha_heap.cc:
        Manual merge.
      sql/ha_heap.h:
        Manual merge.
      sql/item_timefunc.cc:
        Manual merge.
      sql/sql_class.cc:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_update.cc:
        Manual merge.
      tests/mysql_client_test.c:
        Manual merge.
      95a3509a
    • unknown's avatar
      Minor fix for BUG#16303 in sp.cc: Simplified code in sp_routine_exists_in_table(). · 7fd41b20
      unknown authored
      (No change of functionality)
      
      
      sql/sp.cc:
        Simplified code in sp_routine_exists_in_table().
      7fd41b20
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result · 9b3e6c27
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      9b3e6c27
    • unknown's avatar
      Convert exponent results for MYSQL_TYPE_FLOAT on Windows · fb6928cb
      unknown authored
      
      client/mysqltest.c:
        Do the magic for MYSQL_TYPE_FLOAT as well
      fb6928cb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1a9ed28b
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      1a9ed28b
    • unknown's avatar
      Fixed bug #16382. · 7ea60ae9
      unknown authored
      When an ambiguous field name is used in a group by clause a warning is issued
      in the find_order_in_list function by a call to push_warning_printf.
      An expression that was not always valid was passed to this call as the field
      name parameter.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #16382.
      mysql-test/t/view.test:
        Added a test case for bug #16382.
      7ea60ae9
  5. 01 Feb, 2006 8 commits
    • unknown's avatar
      fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset) · 1e686ae7
      unknown authored
      
      libmysql/libmysql.c:
        stmt->mysql could be 0x0 if the connection has failed between prepare and execute
        or any other operation. thus if the user decides to use mysql_stmt_reset()
        we should not segfault.
      tests/mysql_client_test.c:
        test for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)
      1e686ae7
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 11ec4175
      unknown authored
      into  mysql.com:/extern/mysql/work/bug15011/mysql-5.0
      
      
      11ec4175
    • unknown's avatar
      Post-review fix for BUG#15011. · 6643f320
      unknown authored
      Added comments.
      
      
      sql/sp_rcontext.cc:
        Added comments to sp_rcontext::find_handler()
      6643f320
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result · f514772d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/type_float.result:
        Auto merged
      mysql-test/t/type_float.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      f514772d
    • unknown's avatar
      Added new test case for BUG#14533: 'desc tbl' in stored procedure causes error 1142 · 8a7bbefc
      unknown authored
        which is no longer repeatable. (Unclear when this was fixed.)
      
      
      mysql-test/r/sp-security.result:
        Updated results for new test case (BUG#14533)
      mysql-test/t/sp-security.test:
        New test case for BUG#14533.
      8a7bbefc
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 94d4b001
      unknown authored
      into  mysql.com:/extern/mysql/work/cantrepeat/mysql-5.0
      
      
      94d4b001
    • unknown's avatar
      Use common function 'append_field' to output the value of one field to the result. · db16cfc5
      unknown authored
      Fix for extra zero in exponent of double values on windows.
      
      
      client/mysqltest.c:
        Write new function 'append_field' which takes care of appending one field to the dynamic string.
        Use function 'append_field' from both ps and normal execution
        Add hack to 'append_field' that removes the extra '0' in exponent for double values on Windows.
      mysql-test/r/type_float.result:
        One zero too much was removed( I think )
      mysql-test/t/insert.test:
        Remove the "replace_result" for extra zero in  exponent
      mysql-test/t/type_float.test:
        Remove the "replace_result" for extra zero in  exponent
      mysql-test/t/variables.test:
        Remove the "replace_result" for extra zero in  exponent
      db16cfc5
    • unknown's avatar
      FIxed bug #14927. · a400e7fe
      unknown authored
      A query with a group by and having clauses could return a wrong
      result set if the having condition contained a constant conjunct 
      evaluated to FALSE.
      It happened because the pushdown condition for table with
      grouping columns lost its constant conjuncts.
      Pushdown conditions are always built by the function make_cond_for_table
      that ignores constant conjuncts. This is apparently not correct when
      constant false conjuncts are present.
      
      
      mysql-test/r/having.result:
        Added A test case for bug #14927.
      mysql-test/t/having.test:
        Added A test case for bug #14927.
      sql/sql_lex.cc:
        Fixed bug #14927.
        Initialized fields for having conditions in  st_select_lex::init_query().
      sql/sql_lex.h:
        Fixed bug #14927.
        Added a field to restore having condititions for execution in SP and PS.
      sql/sql_prepare.cc:
        Fixed bug #14927.
        Added code to restore havinf conditions for execution in SP and PS.
      sql/sql_select.cc:
        Fixed bug #14927.
        Performed evaluation of constant expressions in having clauses.
        If the having condition contains a constant conjunct that is always false
        an empty result set is returned after the optimization phase.
        In this case the corresponding EXPLAIN command now returns 
        "Impossible HAVING" in the last column.
      a400e7fe
  6. 31 Jan, 2006 2 commits
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 86733db8
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss162
      
      
      86733db8
    • unknown's avatar
      Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582. · 6a9a96dc
      unknown authored
        Applied innodb-5.0-ss149/162 snapshots.
      
      
      innobase/btr/btr0sea.c:
        Applied innodb-5.0-149/162 snapshots.
          Account for a race condition when dropping the adaptive hash
          index for a B-tree page (Bug #16582).
          btr_search_drop_page_hash_index(): Retry the operation if a
            hash index with different parameters was built meanwhile.
            Add diagnostics for the case that hash node pointers to
            the page remain. This fix is from Heikki.
          btr_search_info-update_hash(), btr_search_info_update_slow():
            Document the parameter "info" as in/out.
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-149/162 snapshots.
          Do not mistake TABLENAME_ibfk_0 for auto generated id (Bug #16387).
          dict_table_get_highest_foreign_id(): Ignore foreign constraint
            identifiers starting with the pattern TABLENAME_ibfk_0.
      innobase/dict/dict0load.c:
        Applied innodb-5.0-149/162 snapshots.
          dict_load_columns(): Set the charset-collation code
          DATA_MYSQL_BINARY_CHARSET_COLL for those binary string columns
          that lack a charset-collation code, i.e., the tables were created
          with an older version of MySQL/InnoDB than 4.1.2 (Bug #16298).
      innobase/fil/fil0fil.c:
        Applied innodb-5.0-149/162 snapshots.
          Keep track on unflushed modifications to file spaces. When there
          are tens of thousands of file spaces, flushing all files in
          fil_flush_file_spaces() would be very slow (Bug #15653).
          fil_flush_file_spaces(): Only flush unflushed file spaces.
          fil_space_t, fil_system_t: Add a list of unflushed spaces.
      innobase/include/univ.i:
        Applied innodb-5.0-149/162 snapshots.
          Avoid breaking --with-debug builds on QNS and other systems
          whose compiler pretends to be GCC 2.
          Outside __WIN__ define UNIV_INLINE as static inline.
      innobase/os/os0sync.c:
        Applied innodb-5.0-149/162 snapshots.
          Replace goto in os_event_wait with a normal loop.
      innobase/srv/srv0start.c:
        Applied innodb-5.0-149/162 snapshots.
          Fix bug #16157, a crash when innodb_log_group_home_dir is set
          to an empty string. This patch is from Heikki.
      mysql-test/r/innodb.result:
        Applied innodb-5.0-149/162 snapshots.
          Fixed results for added test cases.
      mysql-test/t/innodb.test:
        Applied innodb-5.0-149/162 snapshots.
          Added test cases.
      sql/ha_innodb.cc:
        Applied innodb-5.0-149/162 snapshots.
          Remove some declarations of unused global variables and member
            variables of class ha_innobase.
          Added diagnostic code trx_print() to
            innobase_query_caching_of_table_permitted() to find reason
            why we are holding adaptive search latch.
          Fixed bug #16229 MySQL/InnoDB uses full explicit table locks
            in trigger processing. Take a InnoDB table lock only if user
            has explicitly requested a table lock. Added some additional
            comments to store_lock() and external_lock(). Fixed some
            code style errors.
          Remember to use noninlined versions of the functions on
            ha_innodb.cc !
      sql/ha_innodb.h:
        Applied innodb-5.0-149/162 snapshots.
          Remove some declarations of unused global variables and member
          variables of class ha_innobase.
      6a9a96dc