1. 22 May, 2004 2 commits
    • unknown's avatar
      Merge · 64285a73
      unknown authored
      
      configure.in:
        SCCS merged
      sql/Makefile.am:
        SCCS merged
      sql/handler.cc:
        SCCS merged
      sql/mysql_priv.h:
        SCCS merged
      64285a73
    • unknown's avatar
      Archive merge · f1b106a7
      unknown authored
      
      sql/mysqld.cc:
        Merge of SHOW_COM_OPTION
      f1b106a7
  2. 21 May, 2004 2 commits
    • unknown's avatar
      Resolving merge issues between archive and most recent changes by Monty/NDB · fc81419d
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      fc81419d
    • unknown's avatar
      First commit of archive example. Archive is a simple storage engine that... · 31c1f849
      unknown authored
      First commit of archive example. Archive is a simple storage engine that handles inserts and selects. 
      
      
      acconfig.h:
        Adding undef piece for HAVE_ARCHIVE_DB	
      acinclude.m4:
        Code needed for --with-archive-storage-engine flag for compile.
      configure.in:
        Adding tag for Archive
      sql/Makefile.am:
        Source updates to compile ha_archive
      sql/examples/ha_archive.cc:
        Class file for archive storage engine. First version.
      sql/handler.cc:
        Updates needed for adding archive storage engine.
      sql/handler.h:
        ENUM for archive storage engine.
      sql/mysql_priv.h:
        Archive show options
      sql/mysqld.cc:
        Ifdef foor HAVE_ARCHIVE_DB
      sql/examples/ha_archive.h:
        Include file for archive storage engine addition.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      31c1f849
  3. 18 May, 2004 5 commits
  4. 17 May, 2004 9 commits
    • unknown's avatar
    • unknown's avatar
      InnoDB cleanup: Remove unused function ut_printf() · 93168d59
      unknown authored
      
      innobase/ut/ut0ut.c:
        Remove unused function ut_printf()
      93168d59
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.1 · f3c06fc7
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      
      f3c06fc7
    • unknown's avatar
      InnoDB cleanup: Add const qualifiers to many char* arguments · 6b237533
      unknown authored
      
      innobase/dict/dict0dict.c:
        Replace char* arguments with const char*
      innobase/dict/dict0load.c:
        Replace char* arguments with const char*
      innobase/dict/dict0mem.c:
        Replace char* arguments with const char*
      innobase/fil/fil0fil.c:
        Replace char* arguments with const char*
      innobase/include/data0data.h:
        dfield_set_data(): add const qualifier
      innobase/include/data0data.ic:
        dfield_set_data(): add const qualifier
        (temporarily shut up compiler warnings)
      innobase/include/dict0dict.h:
        Replace char* arguments with const char*
      innobase/include/dict0dict.ic:
        Replace char* arguments with const char*
      innobase/include/dict0load.h:
        Replace char* arguments with const char*
      innobase/include/dict0mem.h:
        Replace char* arguments with const char*
      innobase/include/fil0fil.h:
        Replace char* arguments with const char*
      innobase/include/os0file.h:
        Replace char* arguments with const char*
      innobase/include/os0sync.h:
        Replace char* arguments with const char*
      innobase/include/pars0pars.h:
        Replace char* arguments with const char*
      innobase/include/pars0sym.h:
        Replace char* arguments with const char*
      innobase/include/row0mysql.h:
        Replace char* arguments with const char*
      innobase/include/row0sel.h:
        Replace char* arguments with const char*
      innobase/include/trx0roll.h:
        Replace char* arguments with const char*
      innobase/include/trx0sys.h:
        Replace char* arguments with const char*
      innobase/include/trx0trx.h:
        Replace char* arguments with const char*
      innobase/include/ut0rnd.h:
        Replace char* arguments with const char*
      innobase/include/ut0rnd.ic:
        Replace char* arguments with const char*
      innobase/include/ut0ut.h:
        Remove unused function ut_printf()
      innobase/os/os0file.c:
        Replace char* arguments with const char*
      innobase/os/os0sync.c:
        Replace char* arguments with const char*
      innobase/pars/pars0pars.c:
        Replace char* arguments with const char*
      innobase/pars/pars0sym.c:
        Use mem_heap_strdupl() instead of mem_heap_alloc() and memcpy()
      innobase/row/row0mysql.c:
        Replace char* arguments with const char*
      innobase/row/row0sel.c:
        Replace char* arguments with const char*
      innobase/trx/trx0roll.c:
        Replace char* arguments with const char*
      innobase/trx/trx0sys.c:
        Replace char* arguments with const char*
      6b237533
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0f8cd01a
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.1
      
      
      0f8cd01a
    • unknown's avatar
      typo fixed · 1915bfeb
      unknown authored
      1915bfeb
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 63811cb0
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      63811cb0
    • unknown's avatar
      bug#3681 - order by, distinct, refer to aliased field by name · 484f6cb3
      unknown authored
      check for field_name (not only for name) in find_item_in_list, to be compatible with item->eq() that is done later
      
      
      mysql-test/r/order_by.result:
        bug#3681 - order by, distinct, refer to aliased field by name
      484f6cb3
    • unknown's avatar
      After merge fixes · 3fba03f3
      unknown authored
      
      mysql-test/r/type_float.result:
        Fix result after merge
      sql/log_event.cc:
        Fixed typo
      3fba03f3
  5. 16 May, 2004 3 commits
    • unknown's avatar
      Merge with 4.0.20 · a495f76c
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      innobase/btr/btr0btr.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/dict/dict0load.c:
        Auto merged
      innobase/eval/eval0eval.c:
        Auto merged
      innobase/ibuf/ibuf0ibuf.c:
        Auto merged
      innobase/include/ut0mem.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/row/row0ins.c:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      innobase/row/row0umod.c:
        Auto merged
      innobase/row/row0upd.c:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      innobase/ut/ut0dbg.c:
        Auto merged
      innobase/ut/ut0mem.c:
        Auto merged
      myisam/mi_dynrec.c:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      innobase/os/os0file.c:
        Merge with 4.0.20
        Ensure that we call F_UNLCK for files on which we call F_WRLCK.
        This is to ensure that this code will be portable accross most platforms.
      myisam/ft_boolean_search.c:
        Merge with 4.0.20 (keep original file)
      myisam/ft_parser.c:
        Merge with 4.0.20 (keep original file)
      myisam/ftdefs.h:
        Merge with 4.0.20 (keep original file)
      a495f76c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 8ef62cc1
      unknown authored
      into mishka.local:/home/my/mysql-4.1
      
      
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      8ef62cc1
    • unknown's avatar
      key_cmp -> key_cmp_if_same · 70f79563
      unknown authored
      New records_in_range() interface (similar to read_range())
      Macros for faster bitmap handling
      Simplify read_range() code (#WL1786)
      New general key_cmp() function to compare keys
      
      
      
      
      heap/hp_hash.c:
        New records_in_range() interface
      include/heap.h:
        New records_in_range() interface
      include/my_base.h:
        Moved 'key_range' here so that all table handlers can use it
      include/my_bitmap.h:
        Make some bitmap functions inline for faster usage in one thread
      include/myisam.h:
        New records_in_range() interface
      include/myisammrg.h:
        New records_in_range() interface
      myisam/mi_range.c:
        New records_in_range() interface
      myisam/mi_test2.c:
        New records_in_range() interface
      myisam/rt_test.c:
        New records_in_range() interface
        Indentation fixes
      myisam/sp_test.c:
        New records_in_range() interface
        Indentation fixes
      myisammrg/myrg_range.c:
        New records_in_range() interface
      mysys/my_bitmap.c:
        Make some bitmap functions inline for faster usage in one thread
      sql/examples/ha_example.cc:
        New records_in_range() interface
      sql/field.cc:
        Fixed indentation
      sql/ha_berkeley.cc:
        New records_in_range() interface
      sql/ha_berkeley.h:
        New records_in_range() interface
      sql/ha_heap.cc:
        New records_in_range() interface
      sql/ha_heap.h:
        New records_in_range() interface
      sql/ha_innodb.cc:
        New records_in_range() interface
      sql/ha_innodb.h:
        New records_in_range() interface
      sql/ha_isam.cc:
        New records_in_range() interface
      sql/ha_isam.h:
        New records_in_range() interface
      sql/ha_myisam.cc:
        New records_in_range() interface
      sql/ha_myisam.h:
        New records_in_range() interface
      sql/ha_myisammrg.cc:
        New records_in_range() interface
      sql/ha_myisammrg.h:
        New records_in_range() interface
      sql/ha_ndbcluster.cc:
        New records_in_range() interface
      sql/ha_ndbcluster.h:
        New records_in_range() interface
      sql/handler.cc:
        Simplify read_range() interface:
        - Add 'eq_range' to read_range_first
        - Remove 'eq_range' parameer from read_range_next()
        - Trust values from index_next_same()
        - Simplfy compare_key() by moving key_comparision to key.cc (as this code can be reused from other places)
      sql/handler.h:
        Move key_range to my_base.h to be used by external table handlers
        Simplify read_range() interface
        New records_in_range() interface
      sql/key.cc:
        Rename key_cmp() to key_cmp_if_same() to make it more descriptive
        Add new key_cmp() function usable from range and handler code.
      sql/mysql_priv.h:
        Prototypes for new functions
      sql/opt_range.cc:
        New records_in_range() interface
        Simplify cmp_prev()
        (We can in 5.0 simplify cmp_next() the same way)
      sql/opt_range.h:
        Added key_part_info to QUICK_SELECT to be able to use key_cmp() in get_next()
      sql/opt_sum.cc:
        key_cmp -> key_cmp_if_same
      sql/sql_acl.cc:
        key_cmp -> key_cmp_if_same
      sql/sql_select.cc:
        key_cmp -> key_cmp_if_same
      70f79563
  6. 15 May, 2004 9 commits
  7. 14 May, 2004 10 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 5c7ed146
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      5c7ed146
    • unknown's avatar
      Replication testsuite: making the master-slave synchronization less likely to fail, · 028a672f
      unknown authored
      by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
      in sync_with_master and sync_slave_with_master.
      The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
      but may affect 4.x as well, so fixing it here. Note that I am also fixing
      5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
      until the next 4.0->4.1->5.0 merge.
      
      
      client/mysqltest.c:
        in sync_with_master (and sync_slave_with_master), if MASTER_POS_WAIT() returns NULL,
        it may be that the slave SQL thread did not have time to start yes, so we sleep
        1 sec and retry, 4 times at most.
      mysql-test/r/rpl_server_id2.result:
        result update
      mysql-test/t/rpl_server_id2.test:
        master_slave.inc already drops the table
      028a672f
    • unknown's avatar
      f16022df
    • unknown's avatar
      CXX linker specified for client_test with libmysqld · dd4be024
      unknown authored
      
      libmysqld/examples/Makefile.am:
        CXXLINK specified for client_test with libmysqld
      dd4be024
    • unknown's avatar
      check of item name presence in find_item_in_list (Bug #3752) · c585b669
      unknown authored
      
      mysql-test/r/func_gconcat.result:
        test of Bug #3752
      mysql-test/t/func_gconcat.test:
        test of Bug #3752
      sql/sql_base.cc:
        check of item name presence in find_item_in_list
      c585b669
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ebaa2a56
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
      
      
      ebaa2a56
    • unknown's avatar
      SELECT options print fixed · fb8eb5a1
      unknown authored
      fb8eb5a1
    • unknown's avatar
      Many files: · 7bd91ac0
      unknown authored
        Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
      
      
      sql/sql_class.h:
        Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
      sql/ha_innodb.cc:
        Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
      sql/log_event.cc:
        Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
      sql/slave.cc:
        Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
      sql/sql_db.cc:
        Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
      sql/sql_parse.cc:
        Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
      sql/sql_show.cc:
        Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
      7bd91ac0
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.1 · c016a548
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      
      c016a548
    • unknown's avatar
      InnoDB cleanup: eliminate IB__FILE__ · a7d22043
      unknown authored
      
      innobase/btr/btr0cur.c:
        Replace IB__FILE__ with __FILE__
      innobase/btr/btr0sea.c:
        Replace IB__FILE__ with __FILE__
      innobase/buf/buf0buf.c:
        Replace IB__FILE__ with __FILE__
        Add const qualifiers
      innobase/ibuf/ibuf0ibuf.c:
        Replace IB__FILE__ with __FILE__
      innobase/include/buf0buf.h:
        Replace IB__FILE__ with __FILE__
        Add const qualifiers
      innobase/include/buf0buf.ic:
        Replace IB__FILE__ with __FILE__
      innobase/include/mem0mem.h:
        Replace IB__FILE__ with __FILE__
        Add const qualifiers
      innobase/include/mem0mem.ic:
        Add const qualifiers
      innobase/include/mtr0mtr.h:
        Replace IB__FILE__ with __FILE__
        Add const qualifiers
      innobase/include/mtr0mtr.ic:
        Add const qualifiers
      innobase/include/pars0pars.h:
        Add const qualifiers
      innobase/include/sync0arr.h:
        Add const qualifiers
      innobase/include/sync0ipm.ic:
        Replace IB__FILE__ with __FILE__
      innobase/include/sync0rw.h:
        Replace IB__FILE__ with __FILE__
        Add const qualifiers
      innobase/include/sync0rw.ic:
        Add const qualifiers
      innobase/include/sync0sync.h:
        Replace IB__FILE__ with __FILE__
        Add const qualifiers
      innobase/include/sync0sync.ic:
        Add const qualifiers
      innobase/include/univ.i:
        Remove IB__FILE__
      innobase/include/ut0dbg.h:
        Replace IB__FILE__ with __FILE__
      innobase/lock/lock0lock.c:
        Replace IB__FILE__ with __FILE__
      innobase/log/log0recv.c:
        Replace IB__FILE__ with __FILE__
      innobase/mem/mem0mem.c:
        Add const qualifiers
      innobase/pars/pars0pars.c:
        Add const qualifiers
      innobase/sync/sync0arr.c:
        Add const qualifiers
      innobase/sync/sync0rw.c:
        Replace IB__FILE__ with __FILE__
        Add const qualifiers
      innobase/sync/sync0sync.c:
        Add const qualifiers
      innobase/trx/trx0rec.c:
        Replace IB__FILE__ with __FILE__
      a7d22043