1. 06 Sep, 2004 4 commits
    • unknown's avatar
      removed faked do_work · 3d390679
      unknown authored
      3d390679
    • unknown's avatar
      merge · a52636a0
      unknown authored
      a52636a0
    • unknown's avatar
      merge · fd07116e
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      mysql-test/t/ndb_blob.test:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      fd07116e
    • unknown's avatar
      Added testReadPerf that compares different access methods · f809e037
      unknown authored
      - pk read (batch and serial)
      - unique index read (batch and serial)
      - eq-bound ordered index
      - range ordered index
      - sorted range ordered index
      - interpretered scan
      
      
      ndb/test/ndbapi/Makefile.am:
        Added testReadPerf
      ndb/test/ndbapi/testScanPerf.cpp:
        Removed old #ifdef'ed code
      f809e037
  2. 05 Sep, 2004 1 commit
  3. 04 Sep, 2004 3 commits
    • unknown's avatar
      After merge fixes · 9a63c8e0
      unknown authored
      9a63c8e0
    • unknown's avatar
      Merge with 4.0 to get latest bug fixes · e85e5739
      unknown authored
      
      configure.in:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      mysql-test/r/union.result:
        Merge with 4.0
      mysql-test/t/union.test:
        Merge with 4.0
      sql/ha_innodb.cc:
        Merge with 4.0
      sql/share/german/errmsg.txt:
        Merge with 4.0
      sql/share/portuguese/errmsg.txt:
        Merge with 4.0
      sql/share/russian/errmsg.txt:
        Merge with 4.0
      sql/sql_parse.cc:
        Merge with 4.0
      sql/sql_union.cc:
        Merge with 4.0 (Keep 4.1 code)
      e85e5739
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · a6d00f2e
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
      
      
      a6d00f2e
  4. 03 Sep, 2004 15 commits
    • unknown's avatar
      Fixed initialization of trans id · 73b4f5ef
      unknown authored
      73b4f5ef
    • unknown's avatar
      merged · c0c7e8f5
      unknown authored
      c0c7e8f5
    • unknown's avatar
      BUG#5327 - mi_sort_index() of 2-level tree · f4565513
      unknown authored
      f4565513
    • unknown's avatar
      A fix for bug#4368 '"like" fails in PreparedStatement, crashes · 14c4d0d7
      unknown authored
      server': the bug occurs when arguments of LIKE function are in 
      differentcharacter sets. If these character sets are compatible, 
      we create an item-converter. In prepared mode, this item
      needs to be created in memory of current prepared statement.
      
      
      mysql-test/r/ps.result:
        Test for Bug#4368 added.
      mysql-test/t/ps.test:
        A test case for bug#4368 '"like" fails in PreparedStatement, 
        crashes server'.
      14c4d0d7
    • unknown's avatar
      define macro "DEFINE_ALL_CHARACTER_SETS" in the configure.in completely · 6a5f9b41
      unknown authored
      
      configure.in:
        define macro "DEFINE_ALL_CHARACTER_SETS" completely
      6a5f9b41
    • unknown's avatar
      sql_yacc.yy: · 0d34c635
      unknown authored
        Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
      
      
      sql/sql_yacc.yy:
        Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
      0d34c635
    • unknown's avatar
      Fix for bug #4373: \u behaves differently · 164c5145
      unknown authored
      164c5145
    • unknown's avatar
      add engine=MyISAM to all create table statements in · f7f85eb6
      unknown authored
      mysql_create_system_tables, just in case
      
      
      scripts/mysql_create_system_tables.sh:
        add engine=MyISAM to all create table statements, just in case
      f7f85eb6
    • unknown's avatar
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · c1f29705
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
      
      
      configure.in:
        Auto merged
      c1f29705
    • unknown's avatar
      1. discarded term.h from the distribution · 37aad6bb
      unknown authored
      2. changed key_* to el_ley_* in the libedit key.h
         (because it's in the conflict with the aix definitions)
      3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
      4. added definition of MIN in the cmd-line-utils/libedit/read.c 
         (if it wasn't defined yet)
      5. discarded definition of SUNOS macro from configure.in 
         (now we don't include term.h in the el.h at all)
      
      
      BitKeeper/deleted/.del-term.h~23716a5310508e0:
        Delete: cmd-line-utils/libedit/term.h
      cmd-line-utils/libedit/Makefile.am:
        discarded term.h from the distribution
      cmd-line-utils/libedit/el.c:
        changed 
        key_init -> el_key_init
        key_end -> el_key_end
      cmd-line-utils/libedit/el.h:
        change 
          #include "term.h" 
        to 
          #include "libedit_term.h"
      cmd-line-utils/libedit/key.c:
        changed functions key_... to el_key_... 
        because it's in conflict with the aix definitions
      cmd-line-utils/libedit/key.h:
        changed functions key_... to el_key_... 
        because it's in conflict with the aix definitions
      cmd-line-utils/libedit/map.c:
        changed functions key_... to el_key_... 
        because it's in conflict with the aix definitions
      cmd-line-utils/libedit/read.c:
        1. added definition of MIN
        2. fixed problems with undefined uint
        3. changed key_get to el_key_get
      cmd-line-utils/libedit/term.c:
        1. discarded #include "term.h" at all
        2. changed functions key_* to el_key_*
        3. add declaration of el_key__decode_str
      cmd-line-utils/libedit/tty.c:
        changed functions key_... to el_key_... 
        because it's in conflict with the aix definitions
      configure.in:
        discarded definition of SUNOS macro
        (libedit doesn't require it anymore)
      37aad6bb
    • unknown's avatar
      Remove usage of row count (as it trashes _all_ explain & table status) · 92f58a4b
      unknown authored
      Use order by
      
      
      mysql-test/r/ndb_index_ordered.result:
        Use order by
      mysql-test/t/ndb_index_ordered.test:
        Use order by
      sql/ha_ndbcluster.cc:
        Remove usage of row count (as it trashes _all_ explain & table status)
      92f58a4b
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · f54c4a94
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      f54c4a94
    • unknown's avatar
      Added support for HA_READ_ORDER + · 6302d0d0
      unknown authored
      Added table statistics
      
      
      6302d0d0
    • unknown's avatar
      1bef804e
  5. 02 Sep, 2004 17 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c91fb136
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_prepare.cc:
        Auto merged
      tests/client_test.c:
        Auto merged
      c91fb136
    • unknown's avatar
      Remove extra '/' after mysql_real_data_home · 1b51f98e
      unknown authored
      Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
      
      
      mysql-test/mysql-test-run.sh:
        Ensure that clients used the supplied --socket argument
      mysql-test/r/lowercase_table.result:
        Remove tables used in other tests that may affect this one
      mysql-test/r/rename.result:
        Remove tables used in other tests that may affect this one
      mysql-test/t/lowercase_table.test:
        Remove tables used in other tests that may affect this one
      mysql-test/t/rename.test:
        Remove tables used in other tests that may affect this one
      sql/item_cmpfunc.cc:
        Remove not relevant comment
      sql/sql_class.cc:
        Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
      sql/sql_load.cc:
        Remove extra '/' after mysql_real_data_home
      sql/sql_table.cc:
        Remove extra '/' after mysql_real_data_home
      1b51f98e
    • unknown's avatar
      errmsg.txt: · b871ea38
      unknown authored
        Add GPL comment
      
      
      sql/share/czech/errmsg.txt:
        Add GPL comment
      sql/share/danish/errmsg.txt:
        Add GPL comment
      sql/share/dutch/errmsg.txt:
        Add GPL comment
      sql/share/english/errmsg.txt:
        Add GPL comment
      sql/share/estonian/errmsg.txt:
        Add GPL comment
      sql/share/french/errmsg.txt:
        Add GPL comment
      sql/share/german/errmsg.txt:
        Add GPL comment
      sql/share/greek/errmsg.txt:
        Add GPL comment
      sql/share/hungarian/errmsg.txt:
        Add GPL comment
      sql/share/italian/errmsg.txt:
        Add GPL comment
      sql/share/japanese/errmsg.txt:
        Add GPL comment
      sql/share/korean/errmsg.txt:
        Add GPL comment
      sql/share/norwegian-ny/errmsg.txt:
        Add GPL comment
      sql/share/norwegian/errmsg.txt:
        Add GPL comment
      sql/share/polish/errmsg.txt:
        Add GPL comment
      sql/share/portuguese/errmsg.txt:
        Add GPL comment
      sql/share/romanian/errmsg.txt:
        Add GPL comment
      sql/share/russian/errmsg.txt:
        Add GPL comment
      sql/share/slovak/errmsg.txt:
        Add GPL comment
      sql/share/spanish/errmsg.txt:
        Add GPL comment
      sql/share/swedish/errmsg.txt:
        Add GPL comment
      sql/share/ukrainian/errmsg.txt:
        Add GPL comment
      b871ea38
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9b5a3584
      unknown authored
      into mysql.com:/Users/mikron/mysql-4.1
      
      
      9b5a3584
    • unknown's avatar
      srv0start.c: · 4ad76aed
      unknown authored
        Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php
      
      
      innobase/srv/srv0start.c:
        Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php
      4ad76aed
    • unknown's avatar
      A fix and test case for Bug#4231 "Wrong result with MYSQL_TIME · 0c58737a
      unknown authored
      parameters": when unpacking binary time recieved from client, handle
      the case when length is 0: it means all MYSQL_TIME members are zero.
      
      
      include/my_time.h:
        Declaration for set_zero_time: a tiny piece of code, which I
        see no reason to not reuse.
      libmysql/libmysql.c:
        set_zero_time implementation is now shared between client and
        server.
      sql-common/my_time.c:
        set_zero_time implementation added.
      sql/sql_prepare.cc:
        A fix for Bug#4231 "Wrong result with MYSQL_TIME parameters": 
        when unpacking binary time recieved from client, handle the
        case when length is 0: it means all MYSQL_TIME members are zero.
      tests/client_test.c:
        Test case for bug#4231 "Wrong result with MYSQL_TIME parameters"
      0c58737a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · c83d39c9
      unknown authored
      into poseidon.(none):/home/tomas/mysql-4.1-ndb
      
      
      c83d39c9
    • unknown's avatar
      fixed wrong initial auto increment value bug#5369 · 0d3ade0b
      unknown authored
      
      ndb/tools/waiter.cpp:
        added option to set timeout to ndb_waiter
      0d3ade0b
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 4803d9f1
      unknown authored
      into mysql.com:/Users/mikron/mysql-4.1-ndb
      
      
      4803d9f1
    • unknown's avatar
      see resp file · 46701713
      unknown authored
      
      mysql-test/ndb/ndbcluster.sh:
        added better/safer shutdown
      46701713
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a88ab457
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      tests/client_test.c:
        Auto merged
      a88ab457
    • unknown's avatar
      After merge fixes · 762bee96
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Export MASTER_MYSOCK (used in some tests)
      mysql-test/t/alter_table.test:
        Use MASTER_MYSOCK instead of master.sock
      762bee96
    • unknown's avatar
      Fix for overwriting of the stack when table name length was larger · 9e949061
      unknown authored
      than 32 bytes. getWords interpreted length as number of words and
      got number of bytes.
      
      
      9e949061
    • unknown's avatar
      Fix for bug overwriting stack when table name larger than 32 bytes. · d5bf76c1
      unknown authored
      getWords interprets the length as number of words and previously
      number of bytes was sent in.
      
      
      d5bf76c1
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 58b03d45
      unknown authored
      into mysql.com:/Users/mikron/mysql-4.1
      
      
      58b03d45
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 8628937e
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41-blobs
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      8628937e
    • unknown's avatar
      Merge · 0a6dda55
      unknown authored
      
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Auto merged
      ndb/src/ndbapi/NdbReceiver.cpp:
        Auto merged
      ndb/src/ndbapi/TransporterFacade.cpp:
        Auto merged
      ndb/src/ndbapi/TransporterFacade.hpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        SCCS merged
      0a6dda55