1. 21 Dec, 2004 11 commits
  2. 20 Dec, 2004 6 commits
  3. 19 Dec, 2004 11 commits
    • unknown's avatar
      Changed mode of result files to -rw-rw-r-- · fb69c851
      unknown authored
      
      mysql-test/r/federated.result:
        Change mode to -rw-rw-r--
      mysql-test/r/fulltext2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/grant2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/information_schema_inno.result:
        Change mode to -rw-rw-r--
      mysql-test/r/innodb_handler.result:
        Change mode to -rw-rw-r--
      mysql-test/r/insert_update.result:
        Change mode to -rw-rw-r--
      mysql-test/r/repair.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_create_database.result:
        Change mode to -rw-rw-r--
      mysql-test/r/type_bit.result:
        Change mode to -rw-rw-r--
      fb69c851
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ff0ecc09
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      innobase/os/os0proc.c:
        Auto merged
      ff0ecc09
    • unknown's avatar
      Merge with global tree · 06904103
      unknown authored
      Fixed some found bugs in BIT fields
      Added more test cases for BIT fields and varchar
      
      
      include/my_base.h:
        Merge
        Added HA_BIT_PART for easier test in key.cc
      innobase/os/os0proc.c:
        Fixed typo
      myisam/mi_dbug.c:
        Add printing of BIT types when debugging
      mysql-test/r/show_check.result:
        Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines
      mysql-test/r/type_bit.result:
        More tests
      mysql-test/r/type_varchar.result:
        More tests
      mysql-test/t/show_check.test:
        Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines
      mysql-test/t/type_bit.test:
        More tests
      mysql-test/t/type_varchar.test:
        More tests
      sql/field.cc:
        Added Field::val_int_as_str() to get better logging of bit fields
        Merged new_key_field with move_field() to fix some problems with bit fields
        Fixed some bugs with bit fields
      sql/field.h:
        Added Field::val_int_as_str() to get better logging of bit fields
        Merged new_key_field with move_field() to fix some problems with bit fields
        Fixed some bugs with bit fields
      sql/ha_myisam.cc:
        Fixed problem with unintialized memory (not critical)
      sql/key.cc:
        Fix so that 'key_cmp_if_same' works with bit fields.
      sql/opt_range.cc:
        Move declarations first in function
        Nice printing of bit fields in debug log
      sql/sql_prepare.cc:
        Fixed old merge error (not critical)
      sql/sql_select.cc:
        Use new interface to new_key_field
      sql/sql_select.h:
        Use new interface to new_key_fields()
        This fixes a bug with BIT fields where the upper bit of the data was not stored in the key buffer
      sql/structs.h:
        Extend key_part_flag to be able to add HA_BIT_PART to it
      sql/table.cc:
        Mark BIT key parts with HA_BIT_PART to make test in key.cc simpler
      06904103
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · bf01c529
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0
      
      
      bf01c529
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 960a6e8e
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
      
      
      960a6e8e
    • unknown's avatar
      Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 699f55e7
      unknown authored
      into polly.local:/home/kaa/src/mysql-5.0
      
      
      699f55e7
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e25a6f0
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0
      
      
      0e25a6f0
    • unknown's avatar
      Small cleanup of derived tables handling. · 5bc79c0c
      unknown authored
      We should not call free_tmp_table() for derived table in 
      mysql_derived_filling(), since by this moment this table is already
      registered in THD::derived_tables list and thus free_tmp_table() will
      be called for it automatically in close_thread_tables().
      
      
      sql/sql_derived.cc:
        We should not call free_tmp_table() for derived table in 
        mysql_derived_filling(), since by this moment this table is already
        registered in THD::derived_tables list and thus free_tmp_table() will
        be called for it automatically in close_thread_tables().
      5bc79c0c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 52793e03
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
      
      
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      52793e03
    • unknown's avatar
      fix for Bug#7386 - IM fails to compile on alpha with Compaq C++ compiler · 2aa5d925
      unknown authored
      
      server-tools/instance-manager/mysql_connection.cc:
        use enum value instead of extern const in array definition
      server-tools/instance-manager/priv.cc:
        added a comment to remind of enum value in mysql_connection.cc
      2aa5d925
  4. 18 Dec, 2004 12 commits
    • unknown's avatar
      trx0roll.c: · 67f5704d
      unknown authored
        Put a sensible value of thread id and process no to a background rollback transaction
      
      
      innobase/trx/trx0roll.c:
        Put a sensible value of thread id and process no to a background rollback transaction
      67f5704d
    • unknown's avatar
      trx0roll.c: · 8b936635
      unknown authored
        Fix the rollback progress printout in crash recovery
      
      
      innobase/trx/trx0roll.c:
        Fix the rollback progress printout in crash recovery
      8b936635
    • unknown's avatar
      trx0roll.c: · 8da9faaa
      unknown authored
        Print progress of background rollback of transactions with more than 1000 undo log entries
      srv0start.c, trx0roll.c, log0recv.c, trx0roll.h:
        Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
      
      
      innobase/include/trx0roll.h:
        Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
      innobase/log/log0recv.c:
        Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
      innobase/srv/srv0start.c:
        Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
      innobase/trx/trx0roll.c:
        Print progress of background rollback of transactions with more than 1000 undo log entries
      8da9faaa
    • unknown's avatar
      rem0rec.ic: · b2474e7a
      unknown authored
        Do not use short int in rem0rec.ic, since its size is not fixed in ANSI C; improve comments of the relative offset field in a record; use mach_read_from_2() to read the relative offset field to save CPU time, if the compiler does not optimize a more complex access function
      
      
      innobase/include/rem0rec.ic:
        Do not use short int in rem0rec.ic, since its size is not fixed in ANSI C; improve comments of the relative offset field in a record; use mach_read_from_2() to read the relative offset field to save CPU time, if the compiler does not optimize a more complex access function
      b2474e7a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3fa699ef
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      3fa699ef
    • unknown's avatar
    • unknown's avatar
    • unknown's avatar
      Merge with global tree · e8b60b16
      unknown authored
      
      myisam/mi_key.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysys/my_handler.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/ha_myisam.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
      include/my_base.h:
        Merge
      e8b60b16
    • unknown's avatar
      Add 0x before pointers (to help with debugging) · 8eaef91f
      unknown authored
      Add support for VARCHAR with 1 or 2 length bytes
      Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
      Give error if we got problems in temporary tables during a SELECT
      Don't use new table generated by ALTER TABLE if index generation fails
      Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
      
      
      BUILD/SETUP.sh:
        Add flags for Intel 64
      dbug/dbug.c:
        Add 0x before pointers (to help with debugging)
      heap/_check.c:
        Add 0x before pointers (to help with debugging)
      heap/hp_create.c:
        Add support for VARCHAR with 1 or 2 length bytes
      heap/hp_delete.c:
        Add 0x before pointers
      heap/hp_hash.c:
        Add support for VARCHAR with 1 or 2 length bytes
        Added more debugging
      heap/hp_open.c:
        Add 0x before pointers
      heap/hp_rkey.c:
        Add 0x before pointers
      heap/hp_rrnd.c:
        Add 0x before pointers
      heap/hp_write.c:
        Add 0x before pointers
      include/my_base.h:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/ft_static.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/ft_test1.c:
        Add support for VARCHAR with 1 or 2 length bytes
        Fixed indentation
        (This file should probably be deleted as it doesn't compile)
      myisam/ft_update.c:
        Add support for VARCHAR with 1 or 2 length bytes
        Fixed indentation
        Removed some not needed 'else'
      myisam/mi_check.c:
        Don't give an error for tables packed with myisampack
      myisam/mi_checksum.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/mi_create.c:
        Add support for VARCHAR with 1 or 2 length bytes
        Store in number of pack-length-bytes in keyseg->bit_start
      myisam/mi_dbug.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/mi_dynrec.c:
        Add support for VARCHAR with 1 or 2 length bytes
        (old code in _mi_rec_unpack() didn't really work with VARCHAR's)
      myisam/mi_key.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/mi_open.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/mi_packrec.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/mi_search.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/mi_test1.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/mi_test3.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/mi_test_all.res:
        Update results
      myisam/mi_unique.c:
        Add support for VARCHAR with 1 or 2 length bytes
      myisam/myisampack.c:
        Add support for VARCHAR with 1 or 2 length bytes
      mysql-test/include/varchar.inc:
        Added more tests
      mysql-test/r/bdb.result:
        Update results after new tests
      mysql-test/r/information_schema.result:
        Update results
      mysql-test/r/innodb.result:
        Update results
      mysql-test/r/myisam.result:
        Update results after new tests
      mysql-test/r/ps_1general.result:
        Update results
      mysql-test/t/bdb.test:
        Shorter comments
      mysys/list.c:
        Add 0x before pointers
      mysys/my_handler.c:
        Add support for VARCHAR with 1 or 2 length bytes
      mysys/raid.cc:
        Add 0x before pointers
      sql/field.cc:
        Add support for VARCHAR with 1 or 2 length bytes
      sql/field.h:
        Add support for VARCHAR with 1 or 2 length bytes
      sql/field_conv.cc:
        Add support for VARCHAR with 1 or 2 length bytes
      sql/ha_berkeley.cc:
        Add support for VARCHAR with 1 or 2 length bytes
      sql/ha_heap.cc:
        Add support for VARCHAR with 1 or 2 length bytes
      sql/ha_myisam.cc:
        Ensure that enable_indexes() will report an error if it fails
        Enable VARCHAR packing for MyISAM files
      sql/item_sum.cc:
        Change key_cmp -> cmp() as we are comparing fields, not key segements
      sql/opt_range.cc:
        Add support for VARCHAR with 1 or 2 length bytes
        Change range_end to call ha_index_or_rnd_end() as in some error cases we may be in rnd mode when we abort
      sql/sql_base.cc:
        Remove compiler warning
      sql/sql_parse.cc:
        Move length checking code to sql_table.cc (as we don't have character set for fields at this stage)
      sql/sql_select.cc:
        Add support for VARCHAR with 1 or 2 length bytes
        Ensure that we report an error if we get an error while writing to internal temporary tables
      sql/sql_select.h:
        Add support for VARCHAR with 1 or 2 length bytes
      sql/sql_show.cc:
        Fix typo in comment
      sql/sql_table.cc:
        Don't use new table generated by ALTER TABLE if index generation fails
      vio/vio.c:
        Fixed DBUG info
      vio/viosocket.c:
        Fixed DBUG info
      vio/viossl.c:
        Fixed DBUG info
      vio/viosslfactories.c:
        Fixed DBUG info
      8eaef91f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 491baa97
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      sql/mysqld.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      491baa97
    • unknown's avatar
      More work on truncations in libmysql: after-review fixes. · d9b8e4b8
      unknown authored
      
      libmysql/libmysql.c:
        More post-review fixes for truncation patch:
        - use my_strtoll10
        - workaround for Intel FPU executive precision feature
        - one case when we didn't report possible truncation fixed.
      strings/my_strtoll10.c:
        Fix a comment.
      tests/client_test.c:
        One more test now passes
      d9b8e4b8
    • unknown's avatar
      BUG#7384 IM fails to compile on Solaris. · 59b24f9f
      unknown authored
      Solaris doesn't define INADDR_NONE macro. This resulted in compilation
      failure. (advanced fix)
      
      
      include/my_net.h:
        Added INADDR_NONE define
      sql-common/client.c:
        removed INADDR_NONE define as it is moved to my_net.h
      sql/mysqld.cc:
        add my_net.h define and remove INADDR_NONE
      59b24f9f