1. 17 Aug, 2004 3 commits
    • unknown's avatar
      Limit testIndex CreateAll · 846458c1
      unknown authored
      Limit testBackup BackupOne
      
      846458c1
    • unknown's avatar
      More testBackup fixes · 912a3e85
      unknown authored
      
      ndb/test/ndbapi/testBackup.cpp:
        Drop table after testBackup
      ndb/test/src/NdbBackup.cpp:
        Remove node id
      912a3e85
    • unknown's avatar
      Fix testBackup · 6927b045
      unknown authored
      
      ndb/src/ndbapi/TransporterFacade.cpp:
        Retry alloc of node id
      6927b045
  2. 15 Aug, 2004 6 commits
  3. 14 Aug, 2004 1 commit
  4. 13 Aug, 2004 19 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · 156ec6be
      unknown authored
      into avenger.(none):/export/brian/tina-4.1
      
      
      acinclude.m4:
        Auto merged
      BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
        Auto merged
      configure.in:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      156ec6be
    • unknown's avatar
      Merge resolve. Changed name of ha_example to ha_example_engine. · c30544e7
      unknown authored
      
      sql/set_var.cc:
        Changed have_example to have_example_engine (easier to understand when reading output). Also resolved merge problem.
      c30544e7
    • unknown's avatar
      Merge · 2144a31c
      unknown authored
      
      myisam/mi_key.c:
        SCCS merged
      2144a31c
    • unknown's avatar
      apply UNIQUE constrain correctly for multi-byte charsets · 5bdb9de8
      unknown authored
      only MyISAM is fixed
      
      
      include/m_ctype.h:
        my_charpos() macro
      myisam/mi_key.c:
        apply UNIQUE constrain correctly for multi-byte charsets
      mysql-test/r/binary.result:
        new test
      mysql-test/r/key.result:
        apply UNIQUE constrain correctly for multi-byte charsets
      mysql-test/t/binary.test:
        new test
      mysql-test/t/func_gconcat.test:
        make test to pass w/o InnoDB
      mysql-test/t/key.test:
        apply UNIQUE constrain correctly for multi-byte charsets
      5bdb9de8
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · a2b96f3a
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      a2b96f3a
    • unknown's avatar
      Fix apiConnectptr after execute direct · 12e1e9ba
      unknown authored
      12e1e9ba
    • unknown's avatar
      Dump core if VM_TRACE || ERROR_INSERT · 47fb78bb
      unknown authored
      47fb78bb
    • unknown's avatar
      Fix type for 4115 · 6ad2809b
      unknown authored
      6ad2809b
    • unknown's avatar
      Bug fix for error insert 5038, · 99b9aa34
      unknown authored
      timeout in abort handling with more than 128 operations
      
      99b9aa34
    • unknown's avatar
      New error codes + automatic nulling of tvariables · 073af429
      unknown authored
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        New error codes for LQH
      ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
        Automatic nulling of tvariables
      073af429
    • unknown's avatar
      CSC issue # 3299 fix: · 59f13f4c
      unknown authored
      ENUM and SET type didn't compute their length correctly.
      That showed up for example while converting into a CHAR column.
      
      59f13f4c
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 1748a3eb
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
      
      1748a3eb
    • unknown's avatar
      Removed unused error code · 374d26c6
      unknown authored
      374d26c6
    • unknown's avatar
      Added support for NULL in unique index · a1ab9515
      unknown authored
      a1ab9515
    • unknown's avatar
      ctype_utf8.result, ctype_utf8.test, item_strfunc.cc: · a0805eda
      unknown authored
        LEFT() didn't work well in some cases.
      
      
      sql/item_strfunc.cc:
        LEFT() didn't work well in some cases.
      mysql-test/t/ctype_utf8.test:
        LEFT() didn't work well in some cases.
      mysql-test/r/ctype_utf8.result:
        LEFT() didn't work well in some cases.
      a0805eda
    • unknown's avatar
      Introduced system for automatic clearing of block global variables (VM_TRACE'd) · 1ef0988b
      unknown authored
      
      ndb/src/kernel/vm/SimulatedBlock.cpp:
        Introduced automatic clearing of block global variables
      ndb/src/kernel/vm/SimulatedBlock.hpp:
        Introduced automatic clearing of block global variables
      1ef0988b
    • unknown's avatar
      ctype_utf8.result, ctype_utf8.test, mi_key.c: · 7e622406
      unknown authored
        bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
      
      
      myisam/mi_key.c:
        bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
      mysql-test/t/ctype_utf8.test:
        bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
      mysql-test/r/ctype_utf8.result:
        bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
      7e622406
    • unknown's avatar
      ctype_ucs.result, ctype_ucs.test, item.cc: · aff628dd
      unknown authored
        #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
      
      
      sql/item.cc:
        #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
      mysql-test/t/ctype_ucs.test:
        #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
      mysql-test/r/ctype_ucs.result:
        #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
      aff628dd
    • unknown's avatar
      This is the addition of the CSV engine "aka tina". Its an example engine that... · 518f6daf
      unknown authored
      This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file. 
      
      
      acconfig.h:
        Adding HAVE CSV rule
      acinclude.m4:
        Build option of csv engine
      configure.in:
        Update for building CSV
      sql/Makefile.am:
        Added files for CSV build
      sql/handler.cc:
        Needed options for CSV to be created.
      sql/handler.h:
        CSV type engine enum.
      sql/mysql_priv.h:
        Addition of the have_csv_db variable.
      sql/mysqld.cc:
        Code to show csv option.
      sql/set_var.cc:
        Adding have show variables for both csv and example.
      518f6daf
  5. 12 Aug, 2004 11 commits
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 5ba7165a
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      5ba7165a
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2f663d94
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      2f663d94
    • unknown's avatar
      #4521: unique key prefix interacts poorly with utf8 · cae9d4f3
      unknown authored
      Fix for MyISAM with prefix compressed keys.
      
      cae9d4f3
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.1 · b0af2a09
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      b0af2a09
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · ff53318e
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-874
      
      ff53318e
    • unknown's avatar
      Fix for BUG#4678 "mysql-test-run fails on grant_cache": · eda23cdf
      unknown authored
      do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
      (such behaviour is a feature of mysql_real_connect(), see the manual).
      
      
      mysql-test/t/grant_cache.test:
        do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root').
      sql/slave.cc:
        a comment
      eda23cdf
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 9f7e6882
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      9f7e6882
    • unknown's avatar
      Reenable diskless for faster mysql-test-run · e8d68889
      unknown authored
      e8d68889
    • unknown's avatar
      Added more ndb binaries to ignore · 9af73f29
      unknown authored
      
      BitKeeper/etc/ignore:
        added ndb/test/ndbapi/create_all_tabs ndb/test/ndbapi/create_tab ndb/test/ndbapi/drop_all_tabs ndb/test/ndbapi/flexAsynch ndb/test/ndbapi/flexBench ndb/test/ndbapi/flexHammer ndb/test/ndbapi/flexTT ndb/test/ndbapi/testBackup ndb/test/ndbapi/testBasic ndb/test/ndbapi/testBasicAsynch ndb/test/ndbapi/testBlobs ndb/test/ndbapi/testDataBuffers ndb/test/ndbapi/testDeadlock ndb/test/ndbapi/testDict ndb/test/ndbapi/testIndex ndb/test/ndbapi/testMgm ndb/test/ndbapi/testNdbApi ndb/test/ndbapi/testNodeRestart ndb/test/ndbapi/testOIBasic ndb/test/ndbapi/testOperations ndb/test/ndbapi/testRestartGci ndb/test/ndbapi/testScan ndb/test/ndbapi/testScanInterpreter ndb/test/ndbapi/testScanPerf ndb/test/ndbapi/testSystemRestart ndb/test/ndbapi/testTimeout ndb/test/ndbapi/testTransactions ndb/test/ndbapi/test_event ndb/test/ndbapi/bank/bankCreator ndb/test/ndbapi/bank/bankMakeGL ndb/test/ndbapi/bank/bankSumAccounts ndb/test/ndbapi/bank/bankTimer ndb/test/ndbapi/bank/bankTransactionMaker ndb/test/ndbapi/bank/bankValidateAllGLs
         ndb/test/ndbapi/bank/testBank ndb/test/run-test/atrt ndb/test/tools/copy_tab ndb/test/tools/create_index ndb/test/tools/hugoCalculator ndb/test/tools/hugoFill ndb/test/tools/hugoLoad ndb/test/tools/hugoLockRecords ndb/test/tools/hugoPkDelete ndb/test/tools/hugoPkRead ndb/test/tools/hugoPkReadRecord ndb/test/tools/hugoPkUpdate ndb/test/tools/hugoScanRead ndb/test/tools/hugoScanUpdate ndb/test/tools/ndb_cpcc ndb/test/tools/restart ndb/test/tools/verify_index
      9af73f29
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 95f6c15a
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      95f6c15a
    • unknown's avatar
      Fix for diskless · e4f2d8bf
      unknown authored
      e4f2d8bf