1. 11 May, 2004 4 commits
    • unknown's avatar
      WL# 1729 Handler: error text for NDB errors · f84be2fd
      unknown authored
      - Close an open scan if index_read is called without closing the previous one.
      - Removed some errors that occured during previous merge
      
      
      include/mysqld_error.h:
        Added two new error messages for NDB
      sql/ha_ndbcluster.cc:
        Added more error code mappings, from NDB code to MySQL 
        Added function to print out the error message when an NDB error occurs.
        Added two new error codes, which will represent either a permanent or temporary NDB error.
        Modev get_ndb_lock_type from class to local function
        Removed some merge errors
        New function close_scan, to close an open scan.
      sql/ha_ndbcluster.h:
        Added print_error function, overrides handler::print_error
        Added close_scan
        Moved get_ndb_lock_type from class to local function
      sql/share/czech/errmsg.txt:
        Added two new error messages for NDB
      sql/share/danish/errmsg.txt:
        Added two new error messages for NDB
      sql/share/dutch/errmsg.txt:
        Added two new error messages for NDB
      sql/share/english/errmsg.txt:
        Added two new error messages for NDB
      sql/share/estonian/errmsg.txt:
        Added two new error messages for NDB
      sql/share/french/errmsg.txt:
        Added two new error messages for NDB
      sql/share/german/errmsg.txt:
        Added two new error messages for NDB
      sql/share/greek/errmsg.txt:
        Added two new error messages for NDB
      sql/share/hungarian/errmsg.txt:
        Added two new error messages for NDB
      sql/share/italian/errmsg.txt:
        Added two new error messages for NDB
      sql/share/japanese/errmsg.txt:
        Added two new error messages for NDB
      sql/share/korean/errmsg.txt:
        Added two new error messages for NDB
      sql/share/norwegian-ny/errmsg.txt:
        Added two new error messages for NDB
      sql/share/norwegian/errmsg.txt:
        Added two new error messages for NDB
      sql/share/polish/errmsg.txt:
        Added two new error messages for NDB
      sql/share/portuguese/errmsg.txt:
        Added two new error messages for NDB
      sql/share/romanian/errmsg.txt:
        Added two new error messages for NDB
      sql/share/russian/errmsg.txt:
        Added two new error messages for NDB
      sql/share/serbian/errmsg.txt:
        Added two new error messages for NDB
      sql/share/slovak/errmsg.txt:
        Added two new error messages for NDB
      sql/share/spanish/errmsg.txt:
        Added two new error messages for NDB
      sql/share/swedish/errmsg.txt:
        Added two new error messages for NDB
      sql/share/ukrainian/errmsg.txt:
        Added two new error messages for NDB
      f84be2fd
    • unknown's avatar
      Test case for BUG #3657 · 86bfe9c1
      unknown authored
      
      ndb/test/ndbapi/testScan/testScan.cpp:
        Added test case for "slow" scanning if one node is down
      86bfe9c1
    • unknown's avatar
      Update error code on "parent" connection if a new NdbScanOperation could not be returned · fdae0617
      unknown authored
      
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Set error code on "parent" NdbConnection
      fdae0617
    • unknown's avatar
      Updated ndb_* test cases · cc7353f5
      unknown authored
      Added two new, ndb_replace and ndb_minmax
      
      
      mysql-test/r/ndb_index.result:
        Disable query, since index used is case sensitive
      mysql-test/r/ndb_index_ordered.result:
        Correct faulty CREATE TABLE statement
      mysql-test/r/ndb_index_unique.result:
        Correct faulty CREATE TABLE statement
      mysql-test/t/ndb_index.test:
        Disable query, since index used is case sensitive
      mysql-test/t/ndb_index_ordered.test:
        Correct faulty CREATE TABLE statement
      mysql-test/t/ndb_index_unique.test:
        Correct faulty CREATE TABLE statement
      cc7353f5
  2. 10 May, 2004 6 commits
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5b92b23b
      unknown authored
      into neptunus.(none):/home/magnus/mysql-4.1
      
      
      sql/sql_table.cc:
        Auto merged
      5b92b23b
    • unknown's avatar
      Merged ha_ndbcluster.cc · d6676b0f
      unknown authored
      
      sql/ha_ndbcluster.h:
        Auto merged
      d6676b0f
    • unknown's avatar
      Use correct access method, found using sql-bench and comparing with other handler. · 075eb338
      unknown authored
      
      BitKeeper/deleted/.del-regression.sh~c19f771726612629:
        Delete: ndb/bin/regression.sh
      sql/ha_ndbcluster.cc:
        Change index flags, remove HA_WRONG_ASCII_ORDER and HA_ONLY_WHOLE_INDEX.
        HA_WRONG_ASCII_ORDER was used in field::optimize_range and if it was set, the index was hardly ever used.
        Correct check of start_key and start_key->flag != HA_READ_KEY_EXACT, ignore end-Key in suc a case
        Updated implementation o read_range_first
        Made the calculation of number of bytes par batch easier to underatsn and easier to configure. The value bytesperbatch can be made a config variable.
        AReduce the number of bytes sent per batch, don't overload.
        Increase the value returned from scan_time in order to make it clear to optimizer that scanning is the worst alternative. Always use index if available.
      075eb338
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.1 · e13340b0
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      
      e13340b0
    • unknown's avatar
      Updated ndb_basic · e6bec02e
      unknown authored
      
      mysql-test/r/ndb_basic.result:
        Updated ndb_basic for better coverage
      mysql-test/t/ndb_basic.test:
        Updated ndb_basic for better coverage
      e6bec02e
    • unknown's avatar
      WL# 1728 Handler: use scanReadExclusive for scan update and delete · 444fc1ce
      unknown authored
      
      
      sql/ha_ndbcluster.cc:
        Modified next_result to process fetched records cached in NdbApi before asking NDB for more. 
        It should also NoCommit any pending operations before contacting NDB again.
        Added utility function define_read_attrs to set the fields that should be read.
      sql/ha_ndbcluster.h:
        Add function define_read_attrs, used to set the fields to read
        Add get_nd_lock_type funciton ,to convert MySQL lock type to NDB lock type
        Always compile filtered scan function even if it's not used yet.
        Add variable ops_pending to keep track of "pending" update/delete operations.
      444fc1ce
  3. 07 May, 2004 7 commits
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4a3580ca
      unknown authored
      into neptunus.(none):/home/magnus/mysql-4.1
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      4a3580ca
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.1 · be45b615
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      
      sql/sql_table.cc:
        Auto merged
      be45b615
    • unknown's avatar
      Added additional parameter userdata for mysql_set_local_infile_handler · c6bc3cfb
      unknown authored
      to allow binding of userland functions in PHP.
      
      
      include/mysql.h:
        added new last parameter (void *) for mysql_set_local_infile_handler
        st_mysql_options:
          added void *local_infile_userdata
          added last parameter (void *) for local_infile_init function pointer
      libmysql/libmysql.c:
        added parameter userdata in mysql_set_local_infile_handler
        added parameter (void *userdata __attribute__ ((unused))) in mysql_local_infile_init
        passed additional parameter userdata to init function in handle_local_infile
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      c6bc3cfb
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.1 · 6b313c69
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      
      sql/sql_table.cc:
        Auto merged
      6b313c69
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · c207325a
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-wl1687
      
      
      sql/handler.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      c207325a
    • unknown's avatar
      ctype-win1250ch.c, ctype-czech.c: · e3211fbd
      unknown authored
        Czech collations were renamed to _cs
      Index.xml:
        Czech collation were renamed to _cs
      
      
      sql/share/charsets/Index.xml:
        Czech collation were renamed to _cs
      strings/ctype-czech.c:
        Czech collations were renamed to _cs
      strings/ctype-win1250ch.c:
        Czech collations were renamed to _cs
      e3211fbd
    • unknown's avatar
      Portablity fix for system with case insenstive table names. (Without this... · dedea9b6
      unknown authored
      Portablity fix for system with case insenstive table names. (Without this ALTER TABLE can fail for InnoDB)
      
      
      
      dedea9b6
  4. 06 May, 2004 23 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 33e6b2af
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      libmysql/libmysql.c:
        Auto merged
      33e6b2af
    • unknown's avatar
      Portability fixes · f3544f3c
      unknown authored
      Change strtoll -> my_strtoll10()
      Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
      
      
      configure.in:
        Fixed problem on IRIX64 (One can't have AC_MSG_RESULT on same row as AC_DEFINE
      extra/my_print_defaults.c:
        Fixed wrong definition for 'verbose'
      include/my_global.h:
        Portability fix (IRIX64)
      libmysql/client_settings.h:
        Remove compiler warnings
      libmysql/libmysql.c:
        Remove compiler warnings
      mysql-test/r/func_str.result:
        Updated results
      mysql-test/r/key_cache.result:
        Updated results to not depend on key_blocks_unused
      mysql-test/t/func_str.test:
        More test of long overflow
      mysql-test/t/key_cache.test:
        Updated results to not depend on key_blocks_unused
      sql/item.cc:
        Portability fix (don't use strtoll())
      sql/item.h:
        Portability fix (don't use strtoll())
      sql/item_sum.h:
        Portability fix (don't use strtoll())
      sql/item_timefunc.cc:
        Fixed compiler warning
      strings/ctype-simple.c:
        Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
      strings/ctype-ucs2.c:
        Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
      f3544f3c
    • unknown's avatar
      Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 · a6bd0b3c
      unknown authored
      into hegel.local:/home/miguel/bk/mysql-4.1
      
      
      a6bd0b3c
    • unknown's avatar
      Windows VC++ compiler compatibility · 71d02f6d
      unknown authored
      
      sql/set_var.cc:
        VC++ error compiler compatibility
      71d02f6d
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · b1657c8d
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
      
      
      b1657c8d
    • unknown's avatar
      postreview fixes · cd328cc2
      unknown authored
      
      sql/sql_lex.h:
        description of field
      sql/sql_union.cc:
        layout fixed
      cd328cc2
    • unknown's avatar
      fake_select_lex should be prepared during PS preparation to work correctly · 56568288
      unknown authored
      item_list for fake_select will be created only once
      (problem reported by valgrind in test_union2 fixed)
      
      
      sql/sql_lex.h:
        new function to keep code in one place
      sql/sql_union.cc:
        fake_select_lex should be prepared during PS preparation to work correctly
        item_list for fake_select will be created only once
      56568288
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 2ad8fc47
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      2ad8fc47
    • unknown's avatar
      - removed duplicate file ..\strings\strxnmov.c from the mysqlclient.dsp · 1972bca3
      unknown authored
         that was accidently added by the last BK auto merge
      
      
      VC++Files/client/mysqlclient.dsp:
         - removed duplicate file ..\strings\strxnmov.c that was added by the
           last auto merge
      1972bca3
    • unknown's avatar
      mysql_stmt_reset now expects ok/error packet from server. · 151495ba
      unknown authored
      
      libmysql/libmysql.c:
        Make advanced_command check client reply
      sql/sql_prepare.cc:
        mysql_stmt_reset now sends ok/error reply to the client.
      tests/client_test.c:
        Memory leak fixed.
      151495ba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ffdf46a5
      unknown authored
      into mysql.com:/home/pem/work/mysql-4.1
      
      
      ffdf46a5
    • unknown's avatar
      Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms. · 52656969
      unknown authored
      
      sql/handler.h:
        Fixed (portability) bug. No qualified method names in the class definition.
      sql/item_cmpfunc.h:
        Attempt to silence cast warnings on some platforms.
      sql/item_subselect.h:
        Attempt to silence cast warnings on some platforms.
      sql/set_var.cc:
        Silence warning (missing cast).
      sql/spatial.h:
        Attempt to silence cast warnings on some platforms.
      sql/sql_cache.cc:
        Silence warning (wrong cast).
      sql/sql_lex.h:
        Attempt to silence cast warnings on some platforms.
      52656969
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 96ae3b4d
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      96ae3b4d
    • unknown's avatar
      - Windows compile fixes: added some missing files to the Windows Project · bd43223e
      unknown authored
         files, fixed linking of myisam_ftdump
      
      
      VC++Files/client/mysqlclient.dsp:
         - added strings/ctype.uca.c
      VC++Files/libmysql/libmysql.dsp:
         - added strings/ctype.uca.c
      VC++Files/myisam_ftdump/myisam_ftdump.dsp:
         - added zlib to the link line
      VC++Files/sql/mysqld.dsp:
         - added discover.cpp
      VC++Files/strings/strings.dsp:
         - added strings/ctype.uca.c
      bd43223e
    • unknown's avatar
      Windows VC++ compability fix · ec23080b
      unknown authored
      
      sql/set_var.cc:
        Fix VC++ compiler error
      ec23080b
    • unknown's avatar
      WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again). · bfe2425a
      unknown authored
      HEAP: Copies the key count to a backup variable and sets the key count to zero.
      That way, no HEAP function will ever try to touch any index.
      Re-enabling is done by copying back the backup variable.
      To avoid memory leak at table close, disable deletes all index trees.
      Re-enabling must be done with empty indexes and data anyway. Otherwise,
      the indexes would need to be repaired, wich HEAP is not capable of.
      MyISAM: Only the key_map is cleared and set.
      Re-enabling must be done with empty indexes and data. Otherwise, repair needs
      to be done which will enable all keys persistently.
      The former implementation disabled only non-unique keys and maked this persistent.
      The new implementation additionally can disable all keys, but only without
      making this persistent. Re-enabling all keys can be done without repair,
      if data file and indexes are empty.
      
      
      heap/heapdef.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Pulled hp_clear_keys() out of hp_clear().
      heap/hp_clear.c:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Pulled hp_clear_keys() out of hp_clear().
        Added the new functions for disabling and enabling keys and to ask for the key state.
      include/heap.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added a new HP_SHARE element to save the key count while keys are disabled.
        Added declarations for the new functions.
      myisam/mi_open.c:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added the new functions for disabling and enabling keys and to ask for the key state.
      myisam/myisamdef.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added declarations for the new functions.
      sql/ha_heap.cc:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Pulled set_keys_for_scanning() out of open().
        Added the new functions for disabling and enabling keys and to ask for the key state.
      sql/ha_heap.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added declarations for the new functions.
      sql/ha_myisam.cc:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Extended disable_indexes() for all keys and no save.
        The argument is now 'mode' as it must handle different cases.
        Extended enable_indexes() for no save.
        The new feature needs the new argument 'mode' with the same semantics as in disable_indexes().
        Added indexes_are_disabled() to ask for the key state.
        Extended the existing call to enable_indexes() by the new argument.
      sql/ha_myisam.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Modified the declarations of dis-/enable_indexes() for the new argument.
        Added the declaration of the new function to ask for the key state.
      sql/handler.h:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Added declarations for the operation modes for the key switching functions.
        Modified the declarations of dis-/enable_indexes() for the new argument.
        Added the declaration of the new function to ask for the key state.
      sql/sql_select.cc:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        In create_myisam_from_heap() take notice of disabled keys
        and disable them in the new table before copying the data.
      sql/sql_table.cc:
        WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
        Modified the calls of dis-/enable_indexes() for the new argument.
      bfe2425a
    • unknown's avatar
      Merge with 4.0 to get security patch for check_grant_colum · 445148f0
      unknown authored
      
      innobase/include/os0file.h:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      mysql-test/r/rpl_server_id2.result:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/slave.cc:
        Merge with 4.0
      445148f0
    • unknown's avatar
      Few cleanups to client_test.c · f088cf99
      unknown authored
      
      tests/client_test.c:
        Few cleanups
      f088cf99
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0 · 2d776e36
      unknown authored
      
      sql/sql_acl.cc:
        Auto merged
      2d776e36
    • unknown's avatar
      Remove not used variable · 33359d0b
      unknown authored
      33359d0b
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.1 · f1a2e925
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      f1a2e925
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cc7a8d9b
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      cc7a8d9b
    • unknown's avatar
      Fixed wrong key usage which caused wrong result for some "WHERE... · d91477ce
      unknown authored
      Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
      The bug was introduced in a patch in the 4.1.2 source tree.
      
      
      mysql-test/r/key.result:
        New result
      mysql-test/t/key.test:
        Added test case for bug in key read
      sql/sql_select.cc:
        Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
      d91477ce