1. 24 Nov, 2005 15 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · ad7c2a64
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      mysql-test/t/disabled.def:
        SCCS merged
      ad7c2a64
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 24b7a7a2
      unknown authored
      into  mysql.com:/my/mysql-5.1
      
      24b7a7a2
    • unknown's avatar
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 49fd5546
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      49fd5546
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 80cfee65
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/field.cc:
        Auto merged
      80cfee65
    • unknown's avatar
      added missing drop view at end of test · e19f8a1a
      unknown authored
      e19f8a1a
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.1 · 1944d425
      unknown authored
      into  mysql.com:/home/my/mysql-5.1-TDC
      
      
      sql/handler.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      1944d425
    • unknown's avatar
      Clear variable · a9a4d1ff
      unknown authored
      
      mysql-test/r/view_grant.result:
        Drop things that may be left from old runs
      mysql-test/t/view_grant.test:
        Drop things that may be left from old runs
      a9a4d1ff
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.1 · e29c1d01
      unknown authored
      into  mysql.com:/my/mysql-5.1
      
      e29c1d01
    • unknown's avatar
      Added bitmap_buffer_size() · dfe61091
      unknown authored
      Removed valgrind warnings when using not aligned bitmap buffer size
      Added setting of thread_stack
      
      
      include/my_bitmap.h:
        Added bitmap_buffer_size()
      sql/handler.cc:
        use bitmap_buffer_size()
      sql/opt_range.cc:
        use bitmap_buffer_size()
      sql/sql_insert.cc:
        Use bitmap_buffer_size()
      sql/sql_parse.cc:
        Added setting of thread_stack when taking thread from thread cache
      sql/sql_plugin.cc:
        Set thread_stack
      dfe61091
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.1 · dfc8f877
      unknown authored
      into  mysql.com:/home/my/mysql-5.1-TDC
      
      
      sql/ha_federated.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/examples/ha_tina.h:
        Auto merged
      sql/unireg.h:
        Auto merged
      dfc8f877
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.1 · ccbdca81
      unknown authored
      into  mysql.com:/my/mysql-5.1
      
      
      sql/field.cc:
        Auto merged
      ccbdca81
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.0 · 011ceff8
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/examples/ha_tina.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/unireg.h:
        Auto merged
      sql/examples/ha_tina.cc:
        manual merge
      sql/share/errmsg.txt:
        manual merge
      011ceff8
    • unknown's avatar
      Don't use PATH_MAX for FN_REFLEN as this uses too much stack space · 6eed9d51
      unknown authored
      Larger stack size neaded for open table on x86 64 bit
      Fix failing test cases
      Deleted symlink from bk
      
      
      BitKeeper/etc/ignore:
        added libmysqld/ha_blackhole.cc
      BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
        Delete: libmysqld/ha_blackhole.cc
      include/my_global.h:
        Don't use PATH_MAX for FN_REFLEN as this uses too much stack space.
        (With a PATH_MAX of 4096, we use 80K for opening a table as there is several objects of size FN_REFLEN on stack)
      mysql-test/r/federated.result:
        Update results after error message changes
      mysql-test/r/grant.result:
        Update results after error message changes
      mysql-test/r/grant2.result:
        Update results after error message changes
      sql/ha_federated.cc:
        Fix error messages to be more consistent
      sql/mysql_priv.h:
        Stack size to have when opening a table
        (This was needed on x86 64 bit Linux)
      sql/share/errmsg.txt:
        Remove quotes around error string for federated as two quotes in the output looks strange
      sql/sql_base.cc:
        More correct stack size
      sql/sql_parse.cc:
        Set thread_stack before store_globals()
      sql/unireg.h:
        More correct MAX_DBKEY_LENGTH
      6eed9d51
  2. 23 Nov, 2005 25 commits
    • unknown's avatar
      Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1f0de14c
      unknown authored
      into  regul.home.lan:/mnt/md/bk/mysql-5.0
      
      1f0de14c
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.1 · 079d47f8
      unknown authored
      into  mysql.com:/home/my/mysql-5.1-TDC
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/ha_federated.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        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/key.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/parse_file.cc:
        Auto merged
      sql/set_var.cc:
        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_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        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_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/structs.h:
        Auto merged
      sql/field.cc:
        Merge with global tree
      sql/sql_base.cc:
        Merge with global tree
      sql/table.cc:
        Merge with global tree
      079d47f8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8d839ebe
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/field.cc:
        Auto merged
      8d839ebe
    • unknown's avatar
      Table definition cache, part 2 · 9fb36b2d
      unknown authored
      The table opening process now works the following way:
      - Create common TABLE_SHARE object
      - Read the .frm file and unpack it into the TABLE_SHARE object
      - Create a TABLE object based on the information in the TABLE_SHARE
        object and open a handler to the table object
      
      Other noteworthy changes:
      - In TABLE_SHARE the most common strings are now LEX_STRING's
      - Better error message when table is not found
      - Variable table_cache is now renamed 'table_open_cache'
      - New variable 'table_definition_cache' that is the number of table defintions that will be cached
      - strxnmov() calls are now fixed to avoid overflows
      - strxnmov() will now always add one end \0 to result
      - engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
      - After creating a field object one must call field->init(table) before using it
      
      - For a busy system this change will give you:
       - Less memory usage for table object
       - Faster opening of tables (if it's has been in use or is in table definition cache)
       - Allow you to cache many table definitions objects
       - Faster drop of table
      
      
      mysql-test/mysql-test-run.sh:
        Fixed some problems with --gdb option
        Test both with socket and tcp/ip port that all old servers are killed
      mysql-test/r/flush_table.result:
        More tests with lock table with 2 threads + flush table
      mysql-test/r/information_schema.result:
        Removed old (now wrong) result
      mysql-test/r/innodb.result:
        Better error messages (thanks to TDC patch)
      mysql-test/r/merge.result:
        Extra flush table test
      mysql-test/r/ndb_bitfield.result:
        Better error messages (thanks to TDC patch)
      mysql-test/r/ndb_partition_error.result:
        Better error messages (thanks to TDC patch)
      mysql-test/r/query_cache.result:
        Remove tables left from old tests
      mysql-test/r/temp_table.result:
        Test truncate with temporary tables
      mysql-test/r/variables.result:
        Table_cache -> Table_open_cache
      mysql-test/t/flush_table.test:
        More tests with lock table with 2 threads + flush table
      mysql-test/t/merge.test:
        Extra flush table test
      mysql-test/t/multi_update.test:
        Added 'sleep' to make test predictable
      mysql-test/t/query_cache.test:
        Remove tables left from old tests
      mysql-test/t/temp_table.test:
        Test truncate with temporary tables
      mysql-test/t/variables.test:
        Table_cache -> Table_open_cache
      mysql-test/valgrind.supp:
        Remove warning that may happens becasue threads dies in different order
      mysys/hash.c:
        Fixed wrong DBUG_PRINT
      mysys/mf_dirname.c:
        More DBUG
      mysys/mf_pack.c:
        Better comment
      mysys/mf_tempdir.c:
        More DBUG
        Ensure that we call cleanup_dirname() on all temporary directory paths.
        
        If we don't do this, we will get a failure when comparing temporary table
        names as in some cases the temporary table name is run through convert_dirname())
      mysys/my_alloc.c:
        Indentation fix
      sql/examples/ha_example.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/examples/ha_example.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/examples/ha_tina.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/examples/ha_tina.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/field.cc:
        Update for table definition cache:
        - Field creation now takes TABLE_SHARE instead of TABLE as argument
          (This is becasue field definitions are now cached in TABLE_SHARE)
          When a field is created, one now must call field->init(TABLE) before using it
        - Use s->db instead of s->table_cache_key
        - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
        - make_field() takes TABLE_SHARE as argument instead of TABLE
        - move_field() -> move_field_offset()
      sql/field.h:
        Update for table definition cache:
        - Field creation now takes TABLE_SHARE instead of TABLE as argument
          (This is becasue field definitions are now cached in TABLE_SHARE)
          When a field is created, one now must call field->init(TABLE) before using it
        - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
        - make_field() takes TABLE_SHARE as argument instead of TABLE
        - move_field() -> move_field_offset()
      sql/ha_archive.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_archive.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_berkeley.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Changed name of argument create() to not hide internal 'table' variable.
        table->s  -> table_share
      sql/ha_berkeley.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_blackhole.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_blackhole.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_federated.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Fixed comments
        Remove index variable and replace with pointers (simple optimization)
        move_field() -> move_field_offset()
        Removed some strlen() calls
      sql/ha_federated.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_heap.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Simplify delete_table() and create() as the given file names are now without extension
      sql/ha_heap.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_innodb.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_innodb.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_myisam.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Remove not needed fn_format()
        Fixed for new table->s structure
      sql/ha_myisam.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_myisammrg.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Don't set 'is_view' for MERGE tables
        Use new interface to find_temporary_table()
      sql/ha_myisammrg.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Added flag HA_NO_COPY_ON_ALTER
      sql/ha_ndbcluster.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Fixed wrong calls to strxnmov()
        Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed
        drop_table -> intern_drop_table()
        table->s -> table_share
        Move part_info to TABLE
        Fixed comments & DBUG print's
        New arguments to print_error()
      sql/ha_ndbcluster.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
      sql/ha_partition.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        We can't set up or use part_info when creating handler as there is not yet any table object
        New ha_intialise() to work with TDC (Done by Mikael)
      sql/ha_partition.h:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        Got set_part_info() from Mikael
      sql/handler.cc:
        We new use TABLE_SHARE instead of TABLE when creating engine handlers
        ha_delete_table() now also takes database as an argument
        handler::ha_open() now takes TABLE as argument
        ha_open() now calls ha_allocate_read_write_set()
        Simplify ha_allocate_read_write_set()
        Remove ha_deallocate_read_write_set()
        Use table_share (Cached by table definition cache)
      sql/handler.h:
        New table flag: HA_NO_COPY_ON_ALTER (used by merge tables)
        Remove ha_deallocate_read_write_set()
        get_new_handler() now takes TABLE_SHARE as argument
        ha_delete_table() now gets database as argument
      sql/item.cc:
        table_name and db are now LEX_STRING objects
        When creating fields, we have now have to call field->init(table)
        move_field -> move_field_offset()
      sql/item.h:
        tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR
         instead of BLOB
      sql/item_cmpfunc.cc:
        Fixed call to tmp_table_field_from_field_type()
      sql/item_create.cc:
        Assert if new not handled cast type
      sql/item_func.cc:
        When creating fields, we have now have to call field->init(table)
        dummy_table used by 'sp' now needs a TABLE_SHARE object
      sql/item_subselect.cc:
        Trivial code cleanups
      sql/item_sum.cc:
        When creating fields, we have now have to call field->init(table)
      sql/item_timefunc.cc:
        Item_func_str_to_date::tmp_table_field() now replaced by call to
         tmp_table_field_from_field_type() (see item_timefunc.h)
      sql/item_timefunc.h:
        Simply tmp_table_field()
      sql/item_uniq.cc:
        When creating fields, we have now have to call field->init(table)
      sql/key.cc:
        Added 'KEY' argument to 'find_ref_key' to simplify code
      sql/lock.cc:
        More debugging
        Use create_table_def_key() to create key for table cache
        Allocate TABLE_SHARE properly when creating name lock
        Fix that locked_table_name doesn't test same table twice
      sql/mysql_priv.h:
        New functions for table definition cache
        New interfaces to a lot of functions.
        New faster interface to find_temporary_table() and close_temporary_table()
      sql/mysqld.cc:
        Added support for table definition cache of size 'table_def_size'
        Fixed som calls to strnmov()
        Changed name of 'table_cache' to 'table_open_cache'
      sql/opt_range.cc:
        Use new interfaces
        Fixed warnings from valgrind
      sql/parse_file.cc:
        Safer calls to strxnmov()
        Fixed typo
      sql/set_var.cc:
        Added variable 'table_definition_cache'
        Variable table_cache renamed to 'table_open_cache'
      sql/slave.cc:
        Use new interface
      sql/sp.cc:
        Proper use of TABLE_SHARE
      sql/sp_head.cc:
        Remove compiler warnings
        We have now to call field->init(table)
      sql/sp_head.h:
        Pointers to parsed strings are now const
      sql/sql_acl.cc:
        table_name is now a LEX_STRING
      sql/sql_base.cc:
        Main implementation of table definition cache
        (The #ifdef's are there for the future when table definition cache will replace open table cache)
        Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places
        Views are not yet cached; For the moment we only cache if a table is a view or not.
        
        Faster implementation of find_temorary_table()
        Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()'
        Drop table is slightly faster as we can use the table definition cache to know the type of the table
      sql/sql_cache.cc:
        table_cache_key and table_name are now LEX_STRING
        'sDBUG print fixes
      sql/sql_class.cc:
        table_cache_key is now a LEX_STRING
        safer strxnmov()
      sql/sql_class.h:
        Added number of open table shares (table definitions)
      sql/sql_db.cc:
        safer strxnmov()
      sql/sql_delete.cc:
        Use new interface to find_temporary_table()
      sql/sql_derived.cc:
        table_name is now a LEX_STRING
      sql/sql_handler.cc:
        TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
      sql/sql_insert.cc:
        TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
      sql/sql_lex.cc:
        Make parsed string a const (to quickly find out if anything is trying to change the query string)
      sql/sql_lex.h:
        Make parsed string a const (to quickly find out if anything is trying to change the query string)
      sql/sql_load.cc:
        Safer strxnmov()
      sql/sql_parse.cc:
        Better error if wrong DB name
      sql/sql_partition.cc:
        part_info moved to TABLE from TABLE_SHARE
        Indentation changes
      sql/sql_select.cc:
        Indentation fixes
        Call field->init(TABLE) for new created fields
        Update create_tmp_table() to use TABLE_SHARE properly
      sql/sql_select.h:
        Call field->init(TABLE) for new created fields
      sql/sql_show.cc:
        table_name is now a LEX_STRING
        part_info moved to TABLE
      sql/sql_table.cc:
        Use table definition cache to speed up delete of tables
        Fixed calls to functions with new interfaces
        Don't use 'share_not_to_be_used'
        Instead of doing openfrm() when doing repair, we now have to call
        get_table_share() followed by open_table_from_share().
        Replace some fn_format() with faster unpack_filename().
        Safer strxnmov()
        part_info is now in TABLE
        Added Mikaels patch for partition and ALTER TABLE
        Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER
      sql/sql_test.cc:
        table_name and table_cache_key are now LEX_STRING's
      sql/sql_trigger.cc:
        TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
        safer strxnmov()
        Removed compiler warnings
      sql/sql_update.cc:
        Call field->init(TABLE) after field is created
      sql/sql_view.cc:
        safer strxnmov()
        Create common TABLE_SHARE object for views to allow us to cache if table is a view
      sql/structs.h:
        Added SHOW_TABLE_DEFINITIONS
      sql/table.cc:
        Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects
        
        The table opening process now works the following way:
        - Create common TABLE_SHARE object
        - Read the .frm file and unpack it into the TABLE_SHARE object
        - Create a TABLE object based on the information in the TABLE_SHARE
          object and open a handler to the table object
        
        open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats
      sql/table.h:
        TABLE objects for the same database table now share a common TABLE_SHARE object
        In TABLE_SHARE the most common strings are now LEX_STRING's
      sql/unireg.cc:
        Changed arguments to rea_create_table() to have same order as other functions
        Call field->init(table) for new created fields
      sql/unireg.h:
        Added OPEN_VIEW
      strings/strxnmov.c:
        Change strxnmov() to always add end \0
        This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
      9fb36b2d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · febd3d0d
      unknown authored
      into  mysql.com:/my/mysql-5.1
      
      
      sql/field.cc:
        Auto merged
      febd3d0d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c52112ac
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      sql/sql_class.cc:
        Auto merged
      c52112ac
    • unknown's avatar
      Always initialize THD::thread_stack: it's used in · df29a2cc
      unknown authored
      check_stack_overrun().
      
      
      sql/slave.cc:
        Move initialization of THD::thread_stack before THD::store_globals()
      sql/sql_acl.cc:
        Initialize THD::thread_stack in artificial THDs used
        to load gratns subsystem.
      sql/sql_class.cc:
        Add an assert that THD::thread_stack is assigned.
      sql/sql_insert.cc:
        Add initialization of THD::thread_stack (delayed insert
        thread).
      sql/sql_parse.cc:
        Move initialization of THD::thread_stack before
        THD::store_globals().
      sql/sql_udf.cc:
        Add initialization for THD::thread_stack (an artificial
        THD used to initialize UDF subsystem).
      sql/tztime.cc:
        Add initialization for THD::thread_stack (an artificial
        THD used to initialize timezones).
      df29a2cc
    • unknown's avatar
      Moved long running query to type_newdecimal-big.test · d5cbb57d
      unknown authored
      Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
      
      
      mysql-test/r/type_newdecimal.result:
        Moved long running query to type_newdecimal-big.test
        Removed warnings that depends on floating point comparisions
      mysql-test/t/type_newdecimal.test:
        Moved long running query to type_newdecimal-big.test
        Removed warnings that depends on floating point comparisions
      sql/field.cc:
        Indentation fixes
      sql/my_decimal.cc:
        Fixed that valgrind doesn't give warnings when running with debug
      strings/decimal.c:
        More DBUG printing
      mysql-test/r/type_newdecimal-big.result:
        New BitKeeper file ``mysql-test/r/type_newdecimal-big.result''
      mysql-test/t/type_newdecimal-big.test:
        New BitKeeper file ``mysql-test/t/type_newdecimal-big.test''
      d5cbb57d
    • unknown's avatar
      Disabled a test temporarily. Informed NDB team. · 88be9611
      unknown authored
      88be9611
    • unknown's avatar
      Merge from 5.0 has fixed the disabled compress.test · effd85d5
      unknown authored
      
      mysql-test/t/disabled.def:
        undisable compress test case
      effd85d5
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 · 56cdc1f3
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
      
      
      Makefile.am:
        Auto merged
      client/mysqltest.c:
        Auto merged
      configure.in:
        Auto merged
      extra/Makefile.am:
        Auto merged
      include/Makefile.am:
        Auto merged
      include/my_global.h:
        Auto merged
      libmysqld/examples/Makefile.am:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/r/ndb_alter_table.result:
        Auto merged
      mysql-test/t/ndb_alter_table.test:
        Auto merged
      scripts/Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/ha_federated.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/key.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/structs.h:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      storage/myisam/myisamchk.c:
        Auto merged
      storage/myisam/myisampack.c:
        Auto merged
      storage/ndb/docs/Makefile.am:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      libmysqld/Makefile.am:
        Merged from 5.0 to 5.1.
      sql/ha_berkeley.cc:
        Merged from 5.0 to 5.1.
      sql/lex.h:
        Merged from 5.0 to 5.1.
      sql/set_var.cc:
        Merged from 5.0 to 5.1.
      sql/share/errmsg.txt:
        Merged from 5.0 to 5.1.
      sql/sql_lex.h:
        Merged from 5.0 to 5.1.
      sql/sql_show.cc:
        Merged from 5.0 to 5.1.
      sql/sql_yacc.yy:
        Merged from 5.0 to 5.1.
      56cdc1f3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 227019e2
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      227019e2
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4eda0e48
      unknown authored
      into mysql.com:/M51/mysql-5.1
      
      4eda0e48
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ec47f512
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      ec47f512
    • unknown's avatar
      corrected compile error · 7a943e3f
      unknown authored
          updated listen_event to handle _all_ events
      
      
      storage/ndb/src/common/portlib/NdbThread.c:
        corrected compile error
      storage/ndb/test/tools/listen.cpp:
        updated listen_event to handle _all_ events
      7a943e3f
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e150b6f5
      unknown authored
      into mysql.com:/M51/mysql-5.1
      
      e150b6f5
    • unknown's avatar
      Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0fd88d62
      unknown authored
      into  mysql.com:/usr/home/pem/mysql-5.1-new
      
      0fd88d62
    • unknown's avatar
    • unknown's avatar
      A name of macro is fixed. · 4fedac93
      unknown authored
      4fedac93
    • unknown's avatar
      Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1 · a2578b61
      unknown authored
      
      sql/mysqld.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Auto merged
      a2578b61
    • unknown's avatar
      Added myself to authors.h. · ac41c2f0
      unknown authored
      
      mysql-test/r/show_check.result:
        Updated authors result.
      sql/authors.h:
        Added myself.
      ac41c2f0
    • unknown's avatar
      added ndb testcase WritePartialIgnoreError · b41cd74a
      unknown authored
      (currently causes nodefailure)
      
      
      storage/ndb/test/ndbapi/testNdbApi.cpp:
        added ndb testcase WritePartialIgnoreError
      storage/ndb/test/run-test/daily-basic-tests.txt:
        added ndb testcase WritePartialIgnoreError
      b41cd74a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · eeff6379
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      eeff6379
    • unknown's avatar
      merged · 456a7ec5
      unknown authored
      456a7ec5
    • unknown's avatar
      postmerge fix · 66bf4b86
      unknown authored
      66bf4b86