1. 19 Dec, 2005 2 commits
    • unknown's avatar
      disabled.def: · f6160c7d
      unknown authored
        Disabled 'type_time' until 15805 is closed
      
      
      mysql-test/t/disabled.def:
        Disabled 'type_time' until 15805 is closed
      f6160c7d
    • unknown's avatar
      mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln: · 2a5aa3f2
      unknown authored
        Added "client/mysqlslap"
      mysqlslap.vcproj, mysqlslap.def:
        new file
      
      
      VC++Files/mysql.sln:
        Added "client/mysqlslap"
      netware/Makefile.am:
        Added "client/mysqlslap"
      scripts/make_binary_distribution.sh:
        Added "client/mysqlslap"
      support-files/mysql.spec.sh:
        Added "client/mysqlslap"
      2a5aa3f2
  2. 18 Dec, 2005 6 commits
    • unknown's avatar
      Merge · a5ecdeba
      unknown authored
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/r/ndb_multi.result:
        Auto merged
      mysql-test/r/skip_name_resolve.result:
        Auto merged
      mysql-test/r/type_time.result:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      mysql-test/t/ndb_multi.test:
        Auto merged
      mysql-test/t/skip_name_resolve.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      storage/ndb/src/ndbapi/NdbImpl.hpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbRecAttr.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      zlib/Makefile.am:
        Auto merged
      a5ecdeba
    • unknown's avatar
      Merge · 2de5c141
      unknown authored
      
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/r/ndb_multi.result:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      mysql-test/t/ndb_multi.test:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      2de5c141
    • unknown's avatar
      Makefile.am: · a3a5df43
      unknown authored
        Added 5.0 specific build scripts
      
      
      BUILD/Makefile.am:
        Added 5.0 specific build scripts
      a3a5df43
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · de1c06b9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      BUILD/Makefile.am:
        Auto merged
      de1c06b9
    • unknown's avatar
      Merge · aa6d8551
      unknown authored
      aa6d8551
    • unknown's avatar
      Makefile.am: · e97a4a4a
      unknown authored
        Adjusted listing of files to put into source TAR
      
      
      e97a4a4a
  3. 17 Dec, 2005 1 commit
  4. 16 Dec, 2005 6 commits
  5. 15 Dec, 2005 24 commits
    • unknown's avatar
      Fixed stress parts in shell and perl versions of mysql-test-run script to limit stress testing · 7c4ada14
      unknown authored
      with 20 test loops in case when any limit parameter was specified
      
      
      
      mysql-test/lib/mtr_stress.pl:
        Limit stress testing with 20 test loops in case when any limit parameter was specified
      mysql-test/mysql-test-run.pl:
        Limit stress testing with 20 test loops in case when any limit parameter was specified
      mysql-test/mysql-test-run.sh:
        Limit stress testing with 20 test loops in case when any limit parameter was specified
      7c4ada14
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6f3f33b5
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.1.clean
      
      
      6f3f33b5
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-new · 49a22151
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.1.clean
      
      
      49a22151
    • unknown's avatar
      tests fixed as we implement informative error message · 9008814e
      unknown authored
      
      mysql-test/r/partition_list.result:
        test result fixed
      mysql-test/r/partition_range.result:
        test result fixed
      mysql-test/t/partition_list.test:
        test fixed
      mysql-test/t/partition_range.test:
        test fixed
      9008814e
    • unknown's avatar
      Merge mysql.com:/home/alexi/dev/mysql-4.1-12440 · 4db14a57
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-5.0-12440
      
      
      mysql-test/r/type_time.result:
        Auto merged
      ndb/src/ndbapi/NdbImpl.hpp:
        Auto merged
      ndb/src/ndbapi/NdbRecAttr.cpp:
        Auto merged
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      zlib/Makefile.am:
        Auto merged
      4db14a57
    • unknown's avatar
      Fixed BUG #12440: "Incorrect processing of time values containing · 52c04400
      unknown authored
       long fraction and/or large exponent part".
      
      
      mysql-test/r/type_time.result:
        Fixed testcases results (bug #12440)
      mysql-test/t/type_time.test:
        Added testcases for bug #12440
      sql-common/my_time.c:
        Fixed bug #12440: "Incorrect processing of time values containing
         long fraction and/or large exponent part".
         Modified str_to_time(). Process properly fraction part containing
         more than 6 digits. Check for existence of exponent part which
         may result from %g formatting applied to time value specified as
         large real number.
      52c04400
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release · a848d91e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      mysql-test/r/ndb_multi.result:
        merge
      mysql-test/t/ndb_multi.test:
        merge
      sql/ha_ndbcluster.cc:
        merge
      a848d91e
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4ede1ed3
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      4ede1ed3
    • unknown's avatar
      Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · cb179dd3
      unknown authored
      into trift-lap.fambruehe:/MySQL/M51/work-5.1
      
      
      mysql-test/r/skip_name_resolve.result:
        Auto merged
      mysql-test/t/skip_name_resolve.test:
        Auto merged
      cb179dd3
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-new · 36736898
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.1.clean
      
      
      36736898
    • unknown's avatar
      bug #15524 (partitioning range/list violation error message is insufficient) · a3cc718c
      unknown authored
      
      include/my_base.h:
        HA_ERR_NO_PARTITION_FOUND added
      mysql-test/r/partition_error.result:
        test result fixed
      mysql-test/t/partition_error.test:
        test case added
      sql/ha_partition.cc:
        now we launch the informative error message here
      sql/share/errmsg.txt:
        Error message added
      a3cc718c
    • unknown's avatar
      bug #15521 (Cannot reorganise a partition with a new name equal to the old name) · 1b74cbd9
      unknown authored
      
      mysql-test/r/partition.result:
        result fixed
      mysql-test/r/partition_mgm_err.result:
        result fixed
      mysql-test/t/partition.test:
        test case added
      mysql-test/t/partition_mgm_err.test:
        test modified to produce the declared error
      sql/handler.h:
        check_reorganise_list interface
      sql/sql_partition.cc:
        check_reorganise_list implementation
      sql/sql_table.cc:
        now we call check_reorganise_list to do proper test.
        Also we should set right no_parts value as it can change here
      1b74cbd9
    • unknown's avatar
      Merge joerg@trift2:/M50/part3-kent-joerg · ed1efa7c
      unknown authored
      into trift-lap.fambruehe:/MySQL/M51/merge-5.1
      
      
      mysql-test/r/skip_name_resolve.result:
        Auto merged
      mysql-test/t/skip_name_resolve.test:
        Auto merged
      ed1efa7c
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.0-merge · 36ceef6a
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.1-new
      
      
      mysql-test/r/skip_name_resolve.result:
        Auto merged
      mysql-test/t/skip_name_resolve.test:
        Auto merged
      36ceef6a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 6901d789
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.1-new
      
      
      6901d789
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 409fbaa6
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      409fbaa6
    • unknown's avatar
      Makefile.am: · bb233703
      unknown authored
        - libtool wants spaces on parameters for its command line options
      
      
      zlib/Makefile.am:
        - libtool wants spaces on parameters for its command line options
      bb233703
    • unknown's avatar
      Makefile.am: · b6aaf4f6
      unknown authored
        - libtool wants spaces on parameters for its command line options
      
      
      zlib/Makefile.am:
        - libtool wants spaces on parameters for its command line options
      b6aaf4f6
    • unknown's avatar
      Makefile.am: · 4e971ef7
      unknown authored
        - libtool wants spaces on parameters for its command line options
      
      
      zlib/Makefile.am:
        - libtool wants spaces on parameters for its command line options
      4e971ef7
    • unknown's avatar
      Makefile.am: · 0b42809f
      unknown authored
        - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0
      
      
      zlib/Makefile.am:
        - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0
      0b42809f
    • unknown's avatar
      Makefile.am: · 5b775244
      unknown authored
        - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0
      
      
      zlib/Makefile.am:
        - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0
      5b775244
    • unknown's avatar
      Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 84463962
      unknown authored
      into  mysql.com:/home/novo/MySQL/mysql-5.1
      
      
      support-files/mysql.spec.sh:
        Auto merged
      84463962
    • unknown's avatar
      Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9c695ffe
      unknown authored
      into  mysql.com:/home/novo/MySQL/mysql-5.0
      
      
      9c695ffe
    • unknown's avatar
      Makefile.am: · 3cae8831
      unknown authored
        - modified zlib/Makefile.am so we now generate libz.so.1.2.3 instead of libz.so.0.0.0
      
      
      zlib/Makefile.am:
        - modified zlib/Makefile.am so we now generate libz.so.1.2.3 instead of libz.so.0.0.0
      3cae8831
  6. 14 Dec, 2005 1 commit