1. 31 May, 2007 6 commits
    • unknown's avatar
      post-merge fix · 24b451d8
      unknown authored
      24b451d8
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 6ac0e9ff
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      include/keycache.h:
        Auto merged
      mysql-test/r/key_cache.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      mysys/mf_keycache.c:
        SCCS merged
      6ac0e9ff
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 91cc476d
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      storage/myisam/ft_nlq_search.c:
        Auto merged
      sql/sql_plugin.cc:
        Manual merge
      storage/myisam/ft_boolean_search.c:
        Manual merge
      91cc476d
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-bug23068 · 3ca9a627
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      sql/mysqld.cc:
        Auto merged
      3ca9a627
    • unknown's avatar
      Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables · 823ed138
      unknown authored
      Setting a key_cache_block_size which is not a power of 2
      could corrupt MyISAM tables.
      
      A couple of computations in the key cache code use bit
      operations which do only work if key_cache_block_size
      is a power of 2.
      
      Replaced bit operations by arithmetic operations
      to make key cache able to handle block sizes that are
      not a power of 2.
      
      
      include/keycache.h:
        Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
        Removed element 'key_cache_shift' from KEY_CACHE after
        the changes in mf_keycache.c made it unused.
      mysql-test/r/key_cache.result:
        Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
        Added test result
      mysql-test/t/key_cache.test:
        Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
        Added test
      mysys/mf_keycache.c:
        Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
        Replaced bit operations by arithmetic operations
        to make key cache able to handle block sizes that are
        not a power of 2.
      823ed138
    • unknown's avatar
      Added casts to avoid compiler warnings and fixed a wrong type. · 4605d8f2
      unknown authored
      ```yaml
      Added casts and fixed wrong type.
      ```
      
      Added casts and fixed wrong type.
      ---
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      ---
      Don't give warning that readonly variable is forced to be readonly
      mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
      Fixed wrong reference to the mysql manual
      Fixed wrong prototype that caused some tests to fail on 64 bit platforms
      ---
      Disabled compiler warnings mainly for Win 64.
      ---
      Added casts to remove compiler warnings on windows
      Give warnings also for safe_mutex errors found by test system
      Added some warnings from different machines in pushbuild
      ---
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
      into  mysql.com:/home/my/mysql-5.1
      ---
      Added escapes for double quotes and parenthesis.
      ---
      Archive db fix plus added non-critical warnings
      in ignore list.
      ---
      Fixed previously added patch and added new ignored warning.
      
      
      client/mysqltest.c:
        Added casts to avoid compiler warnings.
        ---
        Added casts to avoid compiler warnings.
      mysql-test/lib/mtr_report.pl:
        Test run now fails if we have [Warning] and [ERROR] as tags in .err file
        Added list of all common 'not fatal' errors to ignore error list
        ---
        Give warnings also for safe_mutex errors
        Added some warnings from different machines in pushbuild
        ---
        Added escapes for double quotes and parenthesis.
        ---
        Added non-critical warnings to be ignored.
        ---
        Fixed a wrong regexp
        Added new non-critical warning
      mysql-test/mysql-test-run-shell.sh:
        Fixed some wrong startup options
      mysql-test/r/func_misc.result:
        Test case for archive db fix.
      mysql-test/t/disabled.def:
        Disable instance manager tests because they generate warnings (and probably don't read the option files correctly)
      mysql-test/t/func_misc.test:
        Test case for archive db fix.
      mysys/array.c:
        Added casts to avoid compiler warnings.
      mysys/hash.c:
        Added casts to avoid compiler warnings.
      mysys/my_compress.c:
        Added casts to remove compiler warnings on windows
      mysys/my_conio.c:
        To avoid a warning from compiler.
      mysys/my_pread.c:
        Archive db fix.
      mysys/my_quick.c:
        Added cast to avoid compiler warning.
        ---
        Added cast to avoid compiler warning.
      sql/ha_ndbcluster_binlog.cc:
        Ensure we log all binglog errors with the "NDB Binlog" tag
      sql/ha_partition.cc:
        result is type bool, so calculation should be forced to
        that also.
      sql/log.cc:
        Fixed compiler problem on Solaris.
      sql/slave.cc:
        Make errors uniform
      sql/sql_class.cc:
        Added cast to remove compiler warnings on windows
      sql/sql_map.cc:
        Added casts to avoid compiler warnings.
        ---
        Added casts to avoid compiler warnings.
      sql/sql_plugin.cc:
        Fixed wrong type.
        ---
        Don't give warning that readonly variable is forced to be readonly
      sql/stacktrace.c:
        Corrected manual reference
      storage/archive/azio.c:
        Archive db fix.
        ---
        Fixed previously added patch.
      storage/blackhole/ha_blackhole.cc:
        Fixed wrong prototype that caused test to fail on 64 bit platforms
      storage/example/ha_example.cc:
        Fixed wrong prototype that caused test to fail on 64 bit platforms
      strings/ctype-ucs2.c:
        Fixed wrong type.
        ---
        Fixed wrong type.
      support-files/compiler_warnings.supp:
        Added new disabled warnings for Win 64.
      4605d8f2
  2. 28 May, 2007 3 commits
    • unknown's avatar
      Changed accidently added tabs back into spaces. · a47d84a7
      unknown authored
      Fixed a bug that came in merge.
      
      
      client/mysqltest.c:
        Changed accidently added tabs back into spaces.
      mysys/array.c:
        Changed accidently added tabs back into spaces.
      sql/set_var.cc:
        Changed accidently added tabs back into spaces.
      sql/sql_insert.cc:
        Removed accidently included line in merge.
      sql/sql_yacc.yy:
        Changed accidently added tabs back into spaces.
      a47d84a7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 00909f67
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      00909f67
    • unknown's avatar
      BUG#18839 - return value of parser->parse() is ignored · fb915b3a
      unknown authored
      Check value returned by parser->parse(). Better handle situations
      when it fails.
      
      
      storage/myisam/ft_boolean_search.c:
        Check value returned by parser->parse().
      storage/myisam/ft_nlq_search.c:
        Check value returned by parser->parse().
      fb915b3a
  3. 26 May, 2007 1 commit
  4. 25 May, 2007 2 commits
  5. 24 May, 2007 14 commits
    • unknown's avatar
      Bug#27836 · 00c74738
      unknown authored
        "sql_plugin.cc, dynamic_array is not dynamic"
        When the DYNAMIC_ARRAYs were resized, pointers became invalid.
        Solved by only storing pointers within the DYNAMIC_ARRAYs.
      
      
      sql/sql_plugin.cc:
        Bug27836
          Store pointers to data structures in dynamic arrays: plugin_dl_array, plugin_array
          Allocate data structures in plugin_mem_root
      00c74738
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 28bc4ba4
      unknown authored
      into  linux-th5m.site:/home/my/mysql-5.1-marvel
      
      
      include/my_global.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/strtod.c:
        Auto merged
      28bc4ba4
    • unknown's avatar
      Merged from main 5.1 · e43c4f2d
      unknown authored
      e43c4f2d
    • unknown's avatar
      Raise version number after cloning 5.1.19-beta · c9d7c8f9
      unknown authored
      c9d7c8f9
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 59ba51f9
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      59ba51f9
    • unknown's avatar
      Makefile.am : Add "embedded" tests to the "test-bt" target. · 6279ade7
      unknown authored
      
      Makefile.am:
        The "test-bt" target was lacking "embedded" tests -
        add them, dependent on the build of the test binary needed for them.
      6279ade7
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 448df7fe
      unknown authored
      into  linux-th5m.site:/home/my/mysql-5.1-marvel
      
      
      include/keycache.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysys/my_static.c:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      storage/blackhole/ha_blackhole.cc:
        Auto merged
      storage/blackhole/ha_blackhole.h:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_preload.c:
        Auto merged
      mysys/mf_keycache.c:
        Manual merge from main 5.1
      448df7fe
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 69ac4cde
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      extra/comp_err.c:
        Auto merged
      include/decimal.h:
        Auto merged
      include/my_getopt.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/mysql.h:
        Auto merged
      mysys/array.c:
        Auto merged
      mysys/hash.c:
        Auto merged
      mysys/typelib.c:
        Auto merged
      sql/derror.cc:
        Auto merged
      sql/event_data_objects.cc:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/my_decimal.cc:
        Auto merged
      sql/my_decimal.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql/rpl_utility.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_connect.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/structs.h:
        Auto merged
      sql/table.h:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      storage/example/ha_example.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.h:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      storage/ndb/tools/restore/consumer_restore.cpp:
        Auto merged
      strings/decimal.c:
        Auto merged
      strings/strtod.c:
        Auto merged
      include/hash.h:
        Manual merge with 5.1 main tree.
      mysys/my_getopt.c:
        Manual merge with 5.1 main tree.
      sql/field.h:
        Manual merge with 5.1 main tree.
      sql/ha_ndbcluster.cc:
        Manual merge with 5.1 main tree.
      sql/item_cmpfunc.h:
        Manual merge with 5.1 main tree.
      sql/item_create.cc:
        Manual merge with 5.1 main tree.
      sql/item_func.h:
        Manual merge with 5.1 main tree.
      sql/key.cc:
        Manual merge with 5.1 main tree.
      sql/lock.cc:
        Manual merge with 5.1 main tree.
      sql/mysqld.cc:
        Manual merge with 5.1 main tree.
      sql/set_var.cc:
        Manual merge with 5.1 main tree.
      sql/set_var.h:
        Manual merge with 5.1 main tree.
      sql/sql_base.cc:
        Manual merge with 5.1 main tree.
      sql/sql_handler.cc:
        Manual merge with 5.1 main tree.
      sql/sql_insert.cc:
        Manual merge with 5.1 main tree.
      sql/sql_plugin.cc:
        Manual merge with 5.1 main tree.
      sql/sql_table.cc:
        Manual merge with 5.1 main tree.
      sql/sql_yacc.yy:
        Manual merge with 5.1 main tree.
      sql/table.cc:
        Manual merge with 5.1 main tree.
      storage/innobase/handler/ha_innodb.cc:
        Manual merge with 5.1 main tree.
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Manual merge with 5.1 main tree.
      storage/ndb/tools/restore/restore_main.cpp:
        Manual merge with 5.1 main tree.
      69ac4cde
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 70cc58b2
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      70cc58b2
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 0f322a14
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/strtod.c:
        Auto merged
      0f322a14
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 0c13c399
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      0c13c399
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · 17221bd0
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/strtod.c:
        Auto merged
      17221bd0
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 9610f72d
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/strtod.c:
        Auto merged
      9610f72d
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 1c0389d7
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
      
      1c0389d7
  6. 23 May, 2007 9 commits
  7. 22 May, 2007 5 commits