1. 20 Jul, 2005 4 commits
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 6708dbdb
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Auto merged
      ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      ndb/test/ndbapi/testBackup.cpp:
        Auto merged
      ndb/test/ndbapi/testNdbApi.cpp:
        Auto merged
      ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      ndb/tools/drop_index.cpp:
        Auto merged
      ndb/tools/listTables.cpp:
        Auto merged
      ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
        merge
      ndb/src/ndbapi/ndberror.c:
        merge
      ndb/test/include/HugoOperations.hpp:
        merge
      ndb/test/src/HugoOperations.cpp:
        merge
      6708dbdb
    • unknown's avatar
      bug#11942 - ndb backup · fe073647
      unknown authored
        fix error code to avoid clash with 5.0/5.1
      
      
      ndb/include/kernel/signaldata/AlterTable.hpp:
        Change error codes to remove clash from 5.0
      ndb/include/kernel/signaldata/DropTable.hpp:
        Change error codes to remove clash from 5.0
      ndb/src/ndbapi/ndberror.c:
        Change error codes to remove clash from 5.0
      fe073647
    • unknown's avatar
      bug#11942 - ndb backup with parallell DDL · e071abac
      unknown authored
        add testcase to autotest
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        remove ;
      ndb/test/run-test/daily-basic-tests.txt:
        add test case
      e071abac
    • unknown's avatar
      bug#11942 · 783dbfc3
      unknown authored
      
      ndb/include/kernel/signaldata/AlterTable.hpp:
        Add error code for backup in progress
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Add backup state
      ndb/include/kernel/signaldata/DropTable.hpp:
        Add error code for backup in progress
      ndb/include/ndbapi/NdbDictionary.hpp:
        Add backup state
      ndb/src/kernel/blocks/backup/Backup.cpp:
        1) remove invalid require (util_sequence_ref) crash
        2) Don't backup objects dropping/creating
        3) set correct error code on backup fragment ref (crash)
        4) save TrigAttrInfo header when getting log full (crash)
        5) lock/unlock tables during backup
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        1) add mutex lock/unlock as part of drop/alter table
        2) add lock/unlock for backup
        3) remove TC from backup trigger loop
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Add BACKUP_ONGOING state
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Add backup state
      ndb/src/ndbapi/ndberror.c:
        Add error code for backup in progress
      ndb/test/ndbapi/testBackup.cpp:
        Add testcase for testBackup -n BackupDDL
      ndb/tools/drop_index.cpp:
        Fix ndb_drop_index
      ndb/tools/listTables.cpp:
        Print of backup state
      783dbfc3
  2. 12 Jul, 2005 2 commits
  3. 07 Jul, 2005 1 commit
  4. 06 Jul, 2005 22 commits
  5. 05 Jul, 2005 11 commits
    • unknown's avatar
      Merge jwinstead@production.mysql.com:my/mysql-5.0-10844 · 6efca84f
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      6efca84f
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 036cd173
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/grant.result:
        Merge
      mysql-test/t/grant.test:
        Merge
      036cd173
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7dbf0235
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
      
      
      7dbf0235
    • unknown's avatar
      Fix test cases · 8218398c
      unknown authored
      
      mysql-test/r/query_cache.result:
        Remove stray empty line
      mysql-test/r/grant.result:
        Update results
      mysql-test/t/grant.test:
        Fix test case to
      8218398c
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 97b4cf0e
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
      
      
      97b4cf0e
    • unknown's avatar
      Merge · ad0516d9
      unknown authored
      
      BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
        Auto merged
      BitKeeper/deleted/.del-Makefile.am~41238af048e60515:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      netware/Makefile.am:
        Auto merged
      tests/Makefile.am:
        Auto merged
      vio/Makefile.am:
        SCCS merged
      ad0516d9
    • unknown's avatar
      Makefile.am: · b0a6a8e1
      unknown authored
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      
      
      client/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      cmd-line-utils/libedit/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      dbug/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      extra/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      heap/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      isam/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      libmysql/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      libmysql_r/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      libmysqld/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      libmysqld/examples/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      merge/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      myisam/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      myisammrg/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      mysql-test/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      mysys/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      netware/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      regex/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      sql/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      strings/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      tests/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      vio/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      tools/Makefile.am:
        Added -I$(top_builddir)/include for searching
        generated header files, when builddir != srcdir
      b0a6a8e1
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 711464a1
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      711464a1
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-10986 · a27b5b31
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      a27b5b31
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-11440 · 128712c0
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/sql_table.cc:
        Auto merged
      128712c0
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-11330 · 83d9aa14
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      83d9aa14