1. 30 Sep, 2004 6 commits
    • unknown's avatar
      client_test.test: · 3f31ebd5
      unknown authored
        Use TESTS_BINDIR to point out bin dir for "client_test"
      mysql-test-run.sh:
        Export TESTS_BINDIR to be used from --exec
      
      
      mysql-test/mysql-test-run.sh:
        Export TESTS_BINDIR to be used from --exec
      mysql-test/t/client_test.test:
        Use TESTS_BINDIR to point out bin dir for "client_test"
      3f31ebd5
    • unknown's avatar
      bug#5824 · 8a63a0b5
      unknown authored
      8a63a0b5
    • unknown's avatar
      Merge mysql.com:/home/bk/mysql-4.1 · bfcbca22
      unknown authored
      into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
      
      
      bfcbca22
    • unknown's avatar
      mysql_protocols.test: · 064f4bf4
      unknown authored
        --exec now checks return code, make all command lines succeed
      
      
      mysql-test/t/mysql_protocols.test:
        --exec now checks return code, make all command lines succeed
      064f4bf4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 92e7d03e
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-bg4302
      
      
      sql/item.cc:
        Auto merged
      92e7d03e
    • unknown's avatar
      Final solution for bug# 4302 "Ambiguos order by when renamed column is · 53edc92c
      unknown authored
      identical to another in result"
      According to SQL standard queries like 
      "select t1.a as col from t1, t2 order by a" should return an error if
      both tables contain field a.
      
      
      mysql-test/r/order_by.result:
        Updated test to conform SQL-standard.
      mysql-test/t/order_by.test:
        Updated test to conform SQL-standard.
      sql/item.cc:
        find_item_in_list() has now one more out parameter which is not used
        in item.cc functions.
      sql/mysql_priv.h:
        find_item_in_list(): Added boolean out parameter "unaliased" which
        indicates that we have found field by its original name and not by
        its alias in item (select) list.
      sql/sql_base.cc:
        find_item_in_list(): Added boolean out parameter "unaliased" which
        indicates that we have found field by its original name and not by
        its alias in item (select) list. This means that additional check is
        required to ensure there will be no ambiguity if we would search for this
        field in all tables.
      sql/sql_select.cc:
        find_order_in_list(): If we have found field in select list by its
        original name and not by its alias then we should perform additional
        check to ensure that there will be no ambiguity if we will search for
        this field in all tables. Also small cleanup.
      53edc92c
  2. 28 Sep, 2004 16 commits
    • unknown's avatar
      Some of the recently pushed prepared statements · 22cca358
      unknown authored
      tests were disabled due to failures caused by floating point conversion
      issues on optimized builds).
      
      
      mysql-test/include/ps_conv.inc:
        Disable some of the tests for the test suite to pass on an optimized 
        build (floating point issues...).
      mysql-test/include/ps_query.inc:
        Disable some of the tests for the test suite to pass on an optimized 
        build (floating point issues...).
      mysql-test/r/ps_2myisam.result:
        Fix test results.
      mysql-test/r/ps_3innodb.result:
        Fix test results.
      mysql-test/r/ps_4heap.result:
        Fix test results.
      mysql-test/r/ps_5merge.result:
        Fix test results.
      mysql-test/r/ps_6bdb.result:
        Fix test results.
      mysql-test/r/ps_7ndb.result:
        Fix test results.
      22cca358
    • unknown's avatar
      Merge mysql.com:/home/bk/mysql-4.1 · 18fe537c
      unknown authored
      into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
      
      
      18fe537c
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1ddc28a4
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      1ddc28a4
    • unknown's avatar
      ha_ndbcluster.cc: · e44be292
      unknown authored
        typo
      
      
      sql/ha_ndbcluster.cc:
        typo
      e44be292
    • unknown's avatar
      set correct lockmode in all reads... · e8c4af12
      unknown authored
          move lockmode from scan operation to operation
          added read tuple with lock mode
      
      
      ndb/include/ndbapi/NdbIndexOperation.hpp:
        added read tuple with lock mode
      ndb/include/ndbapi/NdbOperation.hpp:
        move lockmode from scan operation to operation
      ndb/include/ndbapi/NdbScanOperation.hpp:
        move lockmode from scan operation to operation
      ndb/src/ndbapi/NdbIndexOperation.cpp:
        added read tuple with lock mode
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        added read tuple with lock mode
      sql/ha_ndbcluster.cc:
        set correct lockmode in all reads...
        moved lockmode from scan operatoin to operation
      e8c4af12
    • unknown's avatar
      mysql-test-run.sh: · 131c3f70
      unknown authored
        Make timer an option
      
      
      mysql-test/mysql-test-run.sh:
        Make timer an option
      131c3f70
    • unknown's avatar
      Merge mysql.com:/home/bk/mysql-4.1 · fa450407
      unknown authored
      into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      fa450407
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4888de1d
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      4888de1d
    • unknown's avatar
      client_test.test: · 656bcff6
      unknown authored
        Run client_test as a testcase
        new file
      mysql-test-run.sh:
        More clearly report failure if --force, also exit 1
      client_test.c:
        Use MAXPATHLEN in test_frm_bug()
        Renable test cases disabled for running from mysql-test-run
      mysqltest.c:
        Don't check errno from popen, may not be set
      
      
      client/mysqltest.c:
        Don't check errno from popen, may not be set
      tests/client_test.c:
        Use MAXPATHLEN in test_frm_bug()
        Renable test cases disabled for running from mysql-test-run
      mysql-test/mysql-test-run.sh:
        More clearly report failure if --force, also exit 1
      mysql-test/t/client_test.test:
        Run client_test as a testcase
      656bcff6
    • unknown's avatar
      Give store_for_compare a more meaningful name, cleanup and comment the · 9131bd24
      unknown authored
      call.
      
      
      sql/item_cmpfunc.cc:
        Rename: Field::store_for_compare -> Field::can_be_compared_as_longlong
      9131bd24
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 24f6437c
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      24f6437c
    • unknown's avatar
      Merge mysql.com:/home/bk/mysql-4.1 · 34ac282e
      unknown authored
      into mysql.com:/users/kboortz/daily/work/mysql-4.1-es
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      34ac282e
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · f3daec83
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      f3daec83
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 72ae79c3
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      72ae79c3
    • unknown's avatar
      Adjusted so auto_increment value after bulk insert will be exactly +1 after... · 65d4dc98
      unknown authored
      Adjusted so auto_increment value after bulk insert will be exactly +1 after last (if no parallel inserts)
      
      
      
      65d4dc98
    • unknown's avatar
      mysql-test-run.sh: · 886cb240
      unknown authored
        Embarrassing typo
      
      
      mysql-test/mysql-test-run.sh:
        Embarrassing typo
      886cb240
  3. 27 Sep, 2004 3 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1a265d34
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      1a265d34
    • unknown's avatar
      mysql-test-run.sh: · 56a53af1
      unknown authored
        Added timing output for each test case.
        Added --embedded-server option.
      mysqltest.c:
        Added 'start_timer', 'end_timer' commands
      Makefile.am:
        Include mysys/my_getsystime.c to get time function in mysqltest
      Many files:
        new file
      
      
      client/Makefile.am:
        Include mysys/my_getsystime.c to get time function in mysqltest
      client/mysqltest.c:
        Added 'start_timer', 'end_timer' commands
      mysql-test/mysql-test-run.sh:
        Added timing output for each test case.
        Added --embedded-server option.
      56a53af1
    • unknown's avatar
      removed init on ConfigRetriever · a6b64d28
      unknown authored
          added some debug printouts
          some changes in ndbcluster_init to make start of mysqld first work
      
      
      ndb/include/mgmcommon/ConfigRetriever.hpp:
        removed init on ConfigRetriever
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        removed init on ConfigRetriever
        added some debug printouts
      ndb/src/kernel/vm/Configuration.cpp:
        removed init on ConfigRetriever
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        removed init on ConfigRetriever
        added sleep in retry
      sql/ha_ndbcluster.cc:
        some changes in ndbcluster_init to make start of mysqld first work
      a6b64d28
  4. 26 Sep, 2004 11 commits
  5. 25 Sep, 2004 4 commits