1. 26 Jan, 2005 2 commits
    • unknown's avatar
      WL#1420 convert NIST test for mysql · d42fbb43
      unknown authored
        
        Test cases using common object (database,user,table,..) names could probably
        destroy customer data, when connecting to an already running server.
        
        This Changeset contains an auxiliary routine  include/testdb_only.inc" which
        should be sourced by tests doing such dangerous things. 
        The test case will get a "[skipped]" when the environment variable 
        USE_RUNNING_SERVER is not 0 .
        The modified mysql-test-run.sh sets USE_RUNNING_SERVER to 0, when 
        the "mysql-test-run" starts its own server, aka there was no "--extern"
        option.
      
      
      mysql-test/mysql-test-run.sh:
        If mysql-test-run spawns the server by itself, USE_RUNNING_SERVER will be set to 0 instead of "".
            If the option "--extern" was detected, USE_RUNNING_SERVER will be set to 1 instead of "1".
            Several comparisons have to be changed
                 [ -z "$USE_RUNNING_SERVER" ] --> [ $USE_RUNNING_SERVER -eq 0 ]
                 [ -n "$USE_RUNNING_SERVER" ] --> [ $USE_RUNNING_SERVER -eq 1 ]
            USE_RUNNING_SERVER will be exported.
      d42fbb43
    • unknown's avatar
      change to Makefile.am per Serg's request · 56bf2ce9
      unknown authored
      
      libmysqld/examples/Makefile.am:
        Change to Makefile.pm per serg's request, was to go out with federated push, but this fix is needed asap for Lenz. This has passed 'make test'
      56bf2ce9
  2. 25 Jan, 2005 28 commits
    • unknown's avatar
      rem0rec.h: · 6975ce41
      unknown authored
        Corrected formatting of comments.
      rem0rec.ic:
        rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
        in the correct order.
        Corrected formatting of comments.
      
      
      innobase/include/rem0rec.ic:
        rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
        in the correct order.
        Corrected formatting of comments.
      innobase/include/rem0rec.h:
        Corrected formatting of comments.
      6975ce41
    • unknown's avatar
      Some minor fixes. · 026dacc1
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Less restricted permissions.
      mysql-test/r/rpl_rotate_logs.result:
        If the path where mysql-test-run was run was symlinked, this test could
        fail. This is a fix.
      mysql-test/t/rpl_rotate_logs.test:
        If the path where mysql-test-run was run was symlinked, this test could
        fail. This is a fix.
      026dacc1
    • unknown's avatar
      Merge · 082ea848
      unknown authored
      082ea848
    • unknown's avatar
      Some bug fixes and a feature add to mysql-test-run · a2fdebaa
      unknown authored
      
      client/mysql.cc:
        Fixed Bug#981  ".mysql_history is lost if mysql clinent exit when out of space"
      client/mysqlbinlog.cc:
        Fix for mysqlbinlog, mysql_close() needs to be called.
      libmysql/Makefile.shared:
        Added use of my_rename()
      mysql-test/mysql-test-run.sh:
        Added possibility to add file t/testname.disabled. This will disable a
        test with same base name. Additionally, if the .disabled file contains text,
        it will be appended as a comment after the test during run.
      a2fdebaa
    • unknown's avatar
      merge · f796818f
      unknown authored
      
      ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      f796818f
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 47c46e25
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      47c46e25
    • unknown's avatar
      ndb - Move mysql-test-run & testBackup into "basic suite" · e749259d
      unknown authored
      
      ndb/test/run-test/atrt-mysql-test-run:
        Fix result handling
      ndb/test/run-test/daily-basic-tests.txt:
        Move mysql-test-run & testBackup into "basic"
      ndb/test/run-test/daily-devel-tests.txt:
        Move mysql-test-run & testBackup into "basic"
      e749259d
    • unknown's avatar
      Fix two typos in comments. · fec9018e
      unknown authored
      
      sql/sql_parse.cc:
        Fix a comment.
      sql/sql_select.cc:
        Fix a comment.
      fec9018e
    • unknown's avatar
      Merge 4.1 -> 5.0 · f0a6c7e2
      unknown authored
      f0a6c7e2
    • unknown's avatar
      One more after merge fix of Jan Lindström's changeset in 4.1 · 892adb94
      unknown authored
      
      innobase/row/row0ins.c:
        One more after merge fix
      892adb94
    • unknown's avatar
      After merge fixes · 2ecd83a3
      unknown authored
      
      innobase/include/univ.i:
        Auto merged
      innobase/row/row0ins.c:
        After merge fixes of Jan Lindström's patch to 4.1
      2ecd83a3
    • unknown's avatar
      Makefile.am: · 65a0093d
      unknown authored
        after merge fix
      
      
      tests/Makefile.am:
        after merge fix
      65a0093d
    • unknown's avatar
      Merge hundin.mysql.fi:/home/marko/k/mysql-4.0 · b9ae83d5
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      innobase/include/univ.i:
        Auto merged
      b9ae83d5
    • unknown's avatar
      InnoDB: Enable ut_ad() assertions in MySQL debug builds. · b7c59b9e
      unknown authored
      
      innobase/include/univ.i:
        InnoDB: Define UNIV_DEBUG when DBUG_ON (in MySQL) is defined.
        This enables InnoDB debug assertions in debug builds of mysqld.
      b7c59b9e
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · a9ba3fe0
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-5.0
      
      
      a9ba3fe0
    • unknown's avatar
      InnoDB: Write status bits to MLOG_COMP_REC_INSERT entries. · 16ecc675
      unknown authored
      It is not safe to infer the status bits from the B-tree page
      level, because after MLOG_COMP_LIST_END_COPY_CREATED, the
      level will not be initialized before the records have been inserted.
      (Bug #7973)
      
      
      innobase/btr/btr0cur.c:
        Add parameter "offsets" to page_cur_insert_rec_low()
      innobase/include/page0cur.h:
        page_cur_rec_insert(), page_cur_insert_rec_low(): Add param "offsets"
      innobase/include/page0cur.ic:
        page_cur_rec_insert(), page_cur_insert_rec_low(): Add param "offsets"
      innobase/include/rem0rec.h:
        Add rec_get_info_and_status_bits() and rec_set_info_and_status_bits()
      innobase/include/rem0rec.ic:
        Add rec_get_info_and_status_bits() and rec_set_info_and_status_bits()
      innobase/page/page0cur.c:
        page_cur_insert_rec_write_log(), page_cur_parse_insert_rec():
        write the status bits of the record to the log (Bug #7973)
        page_cur_insert_rec_low(): add parameter "offsets"
        page_copy_rec_list_end_to_created_page(): remove unnecessary call
        to mem_heap_create()
      innobase/page/page0page.c:
        page_copy_rec_list_end_no_locks(), page_copy_rec_list_start():
        compute offsets and pass them to page_cur_rec_insert()
      16ecc675
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49920493
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
      
      
      49920493
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ffff1705
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      ffff1705
    • unknown's avatar
      Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261 · c889ba5e
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/5.0
      
      
      mysql-test/r/lowercase_table2.result:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      c889ba5e
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 1e9a367f
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/ndb/ndbcluster.sh:
        Auto merged
      1e9a367f
    • unknown's avatar
      backported ndb_mgm options from 5.0 · bb762b50
      unknown authored
          changed ndb_restore test somewhat to fisrt make the tables in myisam
      
      
      mysql-test/mysql-test-run.sh:
        backported ndb_mgm options from 5.0
      mysql-test/ndb/ndbcluster.sh:
        backported ndb_mgm options from 5.0
      mysql-test/r/ndb_restore.result:
        changed ndb_restore test somewhat to fisrt make the tables in myisam
      mysql-test/t/ndb_restore.test:
        changed ndb_restore test somewhat to fisrt make the tables in myisam
      bb762b50
    • unknown's avatar
      Merge · b2ca5974
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        SCCS merged
      b2ca5974
    • unknown's avatar
      64fcbec8
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b6ad6a12
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
      
      
      sql/sql_table.cc:
        Auto merged
      b6ad6a12
    • unknown's avatar
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7b9468da
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      7b9468da
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · f49910d3
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-4.1
      
      
      f49910d3
    • unknown's avatar
      Fix for BUG#8003 attempt 2: · b796a7e4
      unknown authored
        Call file->external_lock() for handler objects that index_merge code creates in addition to 
        the handler object opened in open_and_lock_tables.
      
      
      b796a7e4
  3. 24 Jan, 2005 10 commits
    • unknown's avatar
      Merge mysql.com:/home/kostja/work/mysql-4.1-5787 · 9531db91
      unknown authored
      into mysql.com:/home/kostja/work/mysql-5.0-root
      
      
      vio/viosocket.c:
        Auto merged
      9531db91
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 4bb1c716
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      4bb1c716
    • unknown's avatar
      A fix for Bug#5787 "mysql_stmt_prepare is upto 8 times slower": · dc43c6ea
      unknown authored
      it's crucial to disable Nagle algorithm on client for no-reply commands
      (like mysql_stmt_free) to always work fast.
      Nagle algorithm instructs the sender to buffer (store) data if any 
      unacknowledged data is outstanding and the size of to-send data is less than
      the network segment. It was exactly the case with COM_STMT_CLOSE after 
      COM_STMT_PREPARE, so the client was waiting for Nagle timer to expire or
       for ACK from the server, while the server was holding up ACK because of 
      delayed acknowledgement algorithm.
      The tricky part is that we have been already disabling Nagle 
      algorithm (by setting TCP_NODELAY)
      almost everywhere except Windows (and maybe Netware).
      It is the reason why the bug was repeatable only with Windows client.
      
      
      vio/viosocket.c:
        A fix for Bug#5787 "mysql_stmt_prepare is upto 8 times slower":
        if we disable Nagle algorithm, do it everywhere.
      dc43c6ea
    • unknown's avatar
      Merge · c312cf27
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/examples/Makefile.am:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      c312cf27
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-7887 · 844fe1ea
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/mysqld.cc:
        Auto merged
      844fe1ea
    • unknown's avatar
      Set lower_case_file_system when it is being tested to check if · 15f37ac2
      unknown authored
      lower_case_tables_names=2 is sensible. Related to Bug #7887.
      
      
      sql/mysqld.cc:
        Set lower_case_file_system when it is being tested to check
        if lower_case_tables_names=2 is sensible.
      15f37ac2
    • unknown's avatar
      merged · 712f3f67
      unknown authored
      
      mysql-test/t/ctype_cp932.test:
        Change mode to -rw-rw-r--
      mysql-test/t/ctype_eucjpms.test:
        Change mode to -rw-rw-r--
      BitKeeper/etc/ignore:
        Added libmysqld/ha_federated.cc to the ignore list
      712f3f67
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 4332ac91
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      tests/mysql_client_test.c:
        Auto merged
      4332ac91
    • unknown's avatar
      merged · a82fd1ea
      unknown authored
      
      BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/mi_packrec.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      sql/sql_analyse.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      tests/client_test.c:
        Auto merged
      a82fd1ea
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ccbc6f05
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      ccbc6f05