1. 08 Apr, 2004 3 commits
    • unknown's avatar
      Don't enable HA_EXTRA_WRITE_CACHE if too few rows · 10e15762
      unknown authored
      Revert main parts of patch for online index builds. Should be done differently
      Added support for %lx in my_snprintf()
      
      
      sql/ha_myisam.cc:
        Don't enable HA_EXTRA_WRITE_CACHE if too few rows
      sql/handler.h:
        Indentaion fix
      sql/mysql_priv.h:
        Removed real_alter_table, mysql_add_column and mysql_drop_column
      sql/sql_class.cc:
        After merge fix
      sql/sql_insert.cc:
        Don't user bulk_insert if only one row (common case)
      sql/sql_parse.cc:
        Added mysql_create_index() and mysql_drop_index() as these are only wrappers for mysql_alter_table()
      sql/sql_table.cc:
        Revert main parts of patch for online index builds
        Changed back to use tabs to make merges possible between trees
      sql/unireg.cc:
        Added comments and minor cleanup
      strings/my_vsnprintf.c:
        Added support for %lx.
        Proper long support
      10e15762
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 46bd7be2
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      46bd7be2
    • unknown's avatar
      Moved reading of ranges from opt_range.cc to handler.cc · 16845a71
      unknown authored
      This gives the handler more optimization possiblities and is needed for NDB cluster
      Fixed not-initialized memory error detected by valgrind
      
      
      mysql-test/mysql-test-run.sh:
        Fixed address to manual page
      mysql-test/r/gis-rtree.result:
        Added test to show fatal error in GIS
      mysql-test/r/grant.result:
        New tests
      mysql-test/t/gis-rtree.test:
        New tests
      mysql-test/t/grant.test:
        New tests
      sql/handler.cc:
        Moved reading of ranges from opt_range.cc to handler.cc
        This gives the handler more optimization possiblities and is needed for NDB cluster
      sql/handler.h:
        Moved reading of ranges from opt_range.cc to handler.cc
        T
      sql/opt_range.cc:
        Moved reading of ranges from opt_range.cc to handler.cc
        Simplified GIS get_next() handling
        Indentation cleanups
      sql/opt_range.h:
        Removed not needed cmp_next()
        Added new QUICK_SELECT method for GIS keys to make code for normal keys easier and faster
      sql/sql_select.cc:
        Fixed wrong handling of usable-keys in test_if_skip_sort_order (not fatal, just a warning from valgrind)
        Added DBUG
        Cleaned up comments
      16845a71
  2. 07 Apr, 2004 16 commits
    • unknown's avatar
      Cleanup/optimizations of structures and key usage to make it easier to move... · 3cb13f79
      unknown authored
      Cleanup/optimizations of structures and key usage to make it easier to move key-range-search to handler
      
      
      sql/field.cc:
        Use 'HA_KEY_BLOB_LENGTH' instead of '2' for 'packed-length'
        Changed 'get_key_image' and 'set_key_image' to take length data part of key (without length-store bytes). This makes the interface easier to use from opt_range.cc
      sql/field.h:
        Indentation fix
      sql/opt_range.cc:
        Changed KEY_PART to use KEY_PART_INFO->store_length (which includes null-byte if needed)
        This makes some functions easier and allowed us to easier use the new get_key_image/set_key_image interfaces
        Simple loop optimization.
      sql/opt_range.h:
        Changed part_length -> store_length and added length to KEY_PART.
        This make this structure more like KEY_PART_INFO
        Added 'sorted' to QUICK_SELECT for NDB
      sql/sql_class.cc:
        Fixed compiler warning
      sql/sql_select.cc:
        Set 'quick->sorted' if keys should be sorted (for NDB)
      sql/table.cc:
        GEOMETRY KEYS doesn't have length prefix in keys
      3cb13f79
    • unknown's avatar
      escaping all molty-statement macro · 94002eb5
      unknown authored
      94002eb5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 2d57a407
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      2d57a407
    • unknown's avatar
      9c810b54
    • unknown's avatar
      Fixed previous security patch. mysqld_safe will use the given --log=file, · 8b332544
      unknown authored
      or if not given, it will try to use the one in datadir, if possible, otherwise
      log file will be disabled.
      
      
      8b332544
    • unknown's avatar
      merged · 3c8ae890
      unknown authored
      
      sql/handler.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      3c8ae890
    • unknown's avatar
      merged · b6f2a534
      unknown authored
      
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      b6f2a534
    • unknown's avatar
      Fix for Hand-Merge · 1bfdb177
      unknown authored
      1bfdb177
    • unknown's avatar
      post-review fixes · 736853e5
      unknown authored
      HA_EXTRA_WRITE_CACHE now part of start_bulk_insert()
      test cleanups
      
      
      BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585:
        Delete: mysql-test/t/repair_part2-master.sh
      BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001:
        Delete: mysql-test/t/repair_part2.test
      BitKeeper/deleted/.del-repair_part2.result~72ca166fb248b566:
        Delete: mysql-test/r/repair_part2.result
      mysql-test/r/myisam.result:
        updated
      mysql-test/t/lowercase_table2.test:
        typo fixed
      mysql-test/r/repair.result:
        single repair.test from repair_part[12].test
      mysql-test/t/lowercase_table3.test:
        typo fixed
      mysql-test/t/lowercase_table_qcache.test:
        newline added
      mysql-test/t/myisam.test:
        updated
      mysql-test/t/repair.test:
        single repair.test from repair_part[12].test
      sql/field.cc:
        reverted
      sql/field.h:
        style fix
      sql/ha_myisam.cc:
        add HA_EXTRA_WRITE_CACHE to start_bulk_insert
      sql/sql_insert.cc:
        add HA_EXTRA_WRITE_CACHE to start_bulk_insert
      sql/sql_load.cc:
        add HA_EXTRA_WRITE_CACHE to start_bulk_insert
      sql/sql_table.cc:
        add HA_EXTRA_WRITE_CACHE to start_bulk_insert
      736853e5
    • unknown's avatar
      Hand-resolved auto merge · cc168fc6
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/unireg.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Hand-merged
      sql/sql_yacc.yy:
        Hand-merged
      cc168fc6
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 0948f976
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
      
      
      mysql-test/r/union.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      0948f976
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 91fb27a3
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_3342/mysql-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      91fb27a3
    • unknown's avatar
      ignore: · 03044fe2
      unknown authored
        added install
      
      
      BitKeeper/etc/ignore:
        added install
      03044fe2
    • unknown's avatar
      Worklog#1563 - Support of on-line CREATE/DROP INDEX. · 3f9a97c1
      unknown authored
      Corrected minor problems of the preceding changeset 1.1705.
      
      
      sql/sql_table.cc:
        Worklog#1563 - Support of on-line CREATE/DROP INDEX.
        Replaced all tabs by a proper number of spaces. In the diff list this looks unaligned sometimes.
        Changed all sprintf to snprintf and checked the return value.
        Fixed key_count<= 0. key_count is unsigned.
        Removed an obsolete comment.
      3f9a97c1
    • unknown's avatar
      after review changes · 08594c47
      unknown authored
      
      sql/log_event.cc:
        non_cachable_table flag changed to cacheable_table
      sql/repl_failsafe.cc:
        non_cachable_table flag changed to cacheable_table
      sql/slave.cc:
        non_cachable_table flag changed to cacheable_table
      sql/sql_acl.cc:
        non_cachable_table flag changed to cacheable_table
      sql/sql_base.cc:
        non_cachable_table flag changed to cacheable_table
      sql/sql_cache.cc:
        non_cachable_table flag changed to cacheable_table
      sql/sql_help.cc:
        non_cachable_table flag changed to cacheable_table
      sql/sql_insert.cc:
        non_cachable_table flag changed to cacheable_table
      sql/sql_parse.cc:
        non_cachable_table flag changed to cacheable_table
      sql/sql_prepare.cc:
        renamed DEBUG tag
      sql/table.h:
        non_cachable_table flag changed to cacheable_table
      08594c47
    • unknown's avatar
      Portability fixes · e9447881
      unknown authored
      Fixed problems with group_concat() and HAVING
      Updated crash-me values
      
      
      sql-bench/limits/mysql-4.0.cfg:
        Rename: sql-bench/limits/mysql.cfg -> sql-bench/limits/mysql-4.0.cfg
      include/my_global.h:
        Safety fix
      libmysqld/Makefile.am:
        Portability fix (For AIX 64 bit)
      mysql-test/r/func_gconcat.result:
        More tests
      mysql-test/t/func_gconcat.test:
        More tests
      sql/field.cc:
        Cleanups
      sql/init.cc:
        moved thread_stack_min to right place
      sql/item_sum.cc:
        Fixed problems with group_concat() and HAVING
        Removed some not needed variables
      sql/item_sum.h:
        Fixed problems with group_concat() and HAVING
        Removed some not needed variables
      sql/mysqld.cc:
        Moved thread_stack_min to right place to handle case where we didn't get as much stack space as we asked for
      sql/sql_parse.cc:
        More debugging
      sql/sql_select.cc:
        Cleanup
      sql/sql_yacc.yy:
        Fixed handling of Item_group_concat() in having. (Arguments should not be handled as refs)
      e9447881
  3. 06 Apr, 2004 13 commits
    • unknown's avatar
      ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(),... · c6270543
      unknown authored
      ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      Field::val_str simplification, comment
      
      
      include/my_base.h:
        typos fixed
      mysql-test/r/myisam.result:
        alter table enable/disable keys
      mysql-test/t/help.test:
        cleanup
      mysql-test/t/myisam.test:
        alter table enable/disable keys
      sql/field.cc:
        Field::val_str() simplification
      sql/field.h:
        Field::val_str() simplification and comment
      sql/field_conv.cc:
        Field::val_str() simplification
      sql/ha_berkeley.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_berkeley.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_heap.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_heap.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_innodb.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_innodb.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_isam.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_isam.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_isammrg.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_isammrg.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_myisam.cc:
        ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      sql/ha_myisam.h:
        ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      sql/ha_myisammrg.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_myisammrg.h:
        ::reset(), HA_FAST_KEY_READ
      sql/handler.h:
        ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      sql/item.cc:
        Field::val_str() simplification
      sql/item_sum.cc:
        Field::val_str() simplification
      sql/key.cc:
        Field::val_str() simplification
      sql/opt_range.cc:
        Field::val_str() simplification
      sql/protocol.cc:
        Field::val_str() simplification
      sql/records.cc:
        HA_FAST_KEY_READ
      sql/sql_acl.cc:
        Field::val_str() simplification
      sql/sql_base.cc:
        ::reset
      sql/sql_insert.cc:
        ::reset(), start_bulk_insert(), end_bulk_insert()
      sql/sql_load.cc:
        start_bulk_insert(), end_bulk_insert()
      sql/sql_show.cc:
        Field::val_str() simplification
      sql/sql_table.cc:
        disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      sql/table.cc:
        Field::val_str() simplification
      c6270543
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2d5635e3
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      2d5635e3
    • unknown's avatar
      fixed · 6c310645
      unknown authored
      bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
      (now it require only SELECT privilege on database)
      
      
      mysql-test/r/show_check.result:
        added test for 
        bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
      mysql-test/t/show_check.test:
        added test for 
        bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
      6c310645
    • unknown's avatar
      Fixed charsetnr sent to the client · 815c23f1
      unknown authored
      815c23f1
    • unknown's avatar
      Fixed a problem with mysqld_multi log file. The default is now datadir/mysqld_multi.log, · ae3d2266
      unknown authored
      if doesn't exists or is not writable, then /var/log/mysqld_multi.log, if does not exists
      or is not writable, then /tmp/mysqld_multi.log, but only in case the file does not yet
      exists in /tmp. Otherwise log will be disabled, unless user explicitely sets it with an
      option.
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      ae3d2266
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 79926634
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_table.cc:
        Auto merged
      79926634
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · f4638489
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      f4638489
    • unknown's avatar
      fixed the tests mysql-test/t/synchronization.test · 315f5d27
      unknown authored
      for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
      
      
      BitKeeper/deleted/.del-synchronization-master.opt~265be23ead00949:
        Delete: mysql-test/t/synchronization-master.opt
      BitKeeper/deleted/.del-have_debug.require~d981522532c711b2:
        Delete: mysql-test/r/have_debug.require
      BitKeeper/deleted/.del-have_debug.inc~f4dc5160b9912226:
        Delete: mysql-test/include/have_debug.inc
      mysql-test/r/synchronization.result:
        fixed the test for 
        Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
      mysql-test/t/synchronization.test:
        fixed the test for 
        Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
      sql/sql_table.cc:
        deleted test sleep from mysql_create_like_table
      315f5d27
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · ca37588f
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      ca37588f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 34e60984
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/sql_prepare.cc:
        Auto merged
      34e60984
    • unknown's avatar
      don't modify constant strings · e78208e5
      unknown authored
      
      sql/sql_prepare.cc:
        use static variable
      e78208e5
    • unknown's avatar
      Previous patch was wrong :( · e7a85e36
      unknown authored
      Here is 2nd version.
      'reduce/reduce conflicts' issue is fixed
      
      
      sql/sql_yacc.yy:
        'reduce/reduce conflicts' issue is fixed
      e7a85e36
    • unknown's avatar
      Fixed warnings from valgrind (not a bug) · 6a868cca
      unknown authored
      Don't add -debug to server version if MYSQL_SERVER_PREFIX is used
      Indentation cleanups
      
      
      myisam/mi_write.c:
        Indentation cleanup
      mysql-test/r/lowercase_table2.result:
        Fixed test results
      sql/filesort.cc:
        Fixed warnings from valgrind (not a bug)
      sql/ha_myisam.cc:
        Indentation cleanup
      sql/mysqld.cc:
        Don't add -debug to server if MYSQL_SERVER_PREFIX is used
      sql/sql_base.cc:
        Indentation cleanup
      sql/sql_show.cc:
        Fixed typo in comment
      sql/sql_table.cc:
        Indentation cleanup
      6a868cca
  4. 05 Apr, 2004 8 commits