1. 07 Sep, 2006 1 commit
    • unknown's avatar
      NDB temporary tables. · 6ba27373
      unknown authored
      Temporary tables are not written to disk by DDL operations. This makes
      DDL much faster (useful for tests), but tables are lost after system
      restart.
      
      New commit, since this feature will not be available in 5.1.
      
      
      storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
        Add new error messages for temporary tables.
      storage/ndb/include/kernel/signaldata/CreateTable.hpp:
        Add new error messages for temporary tables.
      storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
        Add parameter for making table temporary.
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Add parameter for making table temporary.
      storage/ndb/include/kernel/signaldata/ListTables.hpp:
        Add parameter for making table temporary.
      storage/ndb/include/ndb_constants.h:
        Add parameter for making table temporary.
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Add parameter for making table temporary.
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        Add parameter for making table temporary.
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Implement temporary tables.
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Implement temporary tables.
      storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
        Implement temporary tables.
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Implement temporary tables.
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Implement temporary tables.
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        Implement temporary tables.
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Implement temporary tables.
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Implement temporary tables.
      storage/ndb/src/ndbapi/ndberror.c:
        Add new error messages for temporary tables.
      storage/ndb/tools/listTables.cpp:
        Add display of table and index temporary status.
      6ba27373
  2. 29 Aug, 2006 6 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 · 15ede695
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      15ede695
    • unknown's avatar
      Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456 · 2592d4a1
      unknown authored
      into  lamia.home:/home/timka/mysql/src/5.1-bug-21456
      
      
      mysql-test/r/distinct.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      2592d4a1
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 9ec8dba6
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      9ec8dba6
    • unknown's avatar
      ndb - · 8501296a
      unknown authored
        Add order by in rpl_(ndb)_multi_update3 to make result deterministic
      
      
      mysql-test/extra/rpl_tests/rpl_multi_update3.test:
        Add order by in rpl_(ndb)_multi_update3 to make result deterministic
      mysql-test/r/rpl_multi_update3.result:
        Add order by in rpl_(ndb)_multi_update3 to make result deterministic
      mysql-test/r/rpl_ndb_multi_update3.result:
        Add order by in rpl_(ndb)_multi_update3 to make result deterministic
      8501296a
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · d4ffbe74
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      d4ffbe74
    • unknown's avatar
      ndb - · 2479d384
      unknown authored
        fix backup/lcp race
      
      
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        fix backup/lcp race
      2479d384
  3. 28 Aug, 2006 5 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · f26782ad
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/test/src/NDBT_Tables.cpp:
        Auto merged
      f26782ad
    • unknown's avatar
      ndb - · 20ee9cea
      unknown authored
        Snapup testBackup XXXerror
      
      
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Snapup testBackup XXXerror
      storage/ndb/src/kernel/blocks/backup/Backup.hpp:
        Snapup testBackup XXXerror
      20ee9cea
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · c93a7fa1
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      c93a7fa1
    • unknown's avatar
      ndb - bug#21615 · b931e3eb
      unknown authored
        Improve error message when detecting corrupted REDO log
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Improve error message when detecting corrupted REDO log
      b931e3eb
    • unknown's avatar
      ndb - autotest · 4317632e
      unknown authored
        adopt to new error code 755 (invalid tablespace)
      
      
      storage/ndb/test/src/NDBT_Tables.cpp:
        Fxi new error code
      4317632e
  4. 25 Aug, 2006 8 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 · e454fb0c
      unknown authored
      into  zim.(none):/home/brian/mysql/arch-5.1
      
      
      BUILD/compile-alpha-cxx:
        Auto merged
      BUILD/compile-alpha-debug:
        Auto merged
      BUILD/compile-dist:
        Auto merged
      BUILD/compile-ia64-debug-max:
        Auto merged
      CMakeLists.txt:
        Auto merged
      client/mysql.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      BUILD/FINISH.sh:
        Innodbase config still needed.
      e454fb0c
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 9f9c3364
      unknown authored
      into  zim.(none):/home/brian/mysql/arch-5.1
      
      
      sql/handler.cc:
        Auto merged
      9f9c3364
    • unknown's avatar
      Cleanup of unused variables. · ac11ba6c
      unknown authored
      Fixed "discover" in the handler API.
      
      Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread. 
      
      
      sql/ha_innodb.h:
        Unused variable
      sql/ha_ndbcluster.cc:
        Added "discover" to handlerton.
      sql/handler.cc:
        Added plugin loop and correctly now use handler API.
      sql/handler.h:
        Removed unused variable. Added discover to handler API
      sql/mysqld.cc:
        Removed unused variables.
      sql/sql_plugin.cc:
        Fixed DBUG Enter comment (obvious cut paste mistake)
      storage/csv/ha_tina.cc:
        Found that if we don't bzero handlerton, that things can go boom!
        
        This probably needs to be fixed for all handlers
      ac11ba6c
    • unknown's avatar
      ndb - fix some bug in testSRBank · 14b4a251
      unknown authored
      14b4a251
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 42f74d76
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      mysql-test/t/disabled.def:
        Auto merged
      42f74d76
    • unknown's avatar
      6df61606
    • unknown's avatar
      ndb - bug#21806 · 4cf7be0c
      unknown authored
        disable ndb_autodiscover3 (cluster restart (--initial))
      
      
      mysql-test/t/disabled.def:
        ndb - bug#21806
      4cf7be0c
    • unknown's avatar
      fix for windows build · cf9d738b
      unknown authored
      
      CMakeLists.txt:
        add for federated
      libmysqld/CMakeLists.txt:
        ha_heap.cc and ha_myisam.cc are removed
        add for federated
      sql/CMakeLists.txt:
        add for federated
      sql/handler.cc:
        fix for fussy compilers
      storage/heap/CMakeLists.txt:
        add ha_heap.cc
      storage/myisammrg/CMakeLists.txt:
        add ha_myisammrg.cc
      cf9d738b
  5. 24 Aug, 2006 10 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 5cbd0a52
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      mysql-test/t/disabled.def:
        Auto merged
      5cbd0a52
    • unknown's avatar
      ndb - · 430ff6e5
      unknown authored
        disable ndb_binlog_discover as it's broken
        remove debug printout
      
      
      mysql-test/t/disabled.def:
        disable ndb_binlog_discover as it's broken
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        remove debug printout
      430ff6e5
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 7e7acfbe
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      7e7acfbe
    • unknown's avatar
      ndb - fix monster bug in NdbEventOperation->stop where Suma sent uninitialized data · d5246bb1
      unknown authored
            affects basically all replication tests
      
      
      storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
        Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
      storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
        Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        1) Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
        2) make sure to set NdbdNodeId on _TE_STOP
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
      storage/ndb/src/ndbapi/NdbEventOperation.cpp:
        Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
      storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
        Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
      storage/ndb/src/ndbapi/Ndbif.cpp:
        Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
      d5246bb1
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 43dbfa66
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
      
      
      43dbfa66
    • unknown's avatar
      after merge fix · 8eeac5a7
      unknown authored
      8eeac5a7
    • unknown's avatar
      ndb - · 13dc0ea7
      unknown authored
        bug#21800 - 5.0 -> 5.1 merge
      
      
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        bug#21800 - 5.0 -> 5.1 merge
      13dc0ea7
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 4cf8b579
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      4cf8b579
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 84f393f7
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      84f393f7
    • unknown's avatar
      ndb - bug#21800 · 5d82bec5
      unknown authored
        read TransactionDeadlockTimeout (for scans) to cater for insane settings
      
      
      ndb/src/ndbapi/NdbScanOperation.cpp:
        read TransactionDeadlockTimeout to cater for insane settings
      5d82bec5
  6. 23 Aug, 2006 10 commits
    • unknown's avatar
      This is a cleanup of warnings that windows is complaining about. · 4ec86b1c
      unknown authored
      
      client/mysql.cc:
        Windows warnings clean up
      server-tools/instance-manager/parse.cc:
        Cleanedup warning
      sql/field.cc:
        Removed unused variables
      sql/filesort.cc:
        Removed unused variables
      sql/ha_innodb.cc:
        Removed unused variables
      sql/ha_partition.cc:
        Fixing warning
      sql/partition_element.h:
        Fixing declaration for warnings
      4ec86b1c
    • unknown's avatar
      This patch removes need for a innodb to have its own configure. · fb47d658
      unknown authored
      
      BitKeeper/deleted/.del-configure.in:
        Delete: storage/innobase/configure.in
      BUILD/FINISH.sh:
        Removed work for Innodb's configure
      BUILD/autorun.sh:
        Removed pieces for Innodb's build
      storage/innobase/Makefile.am:
        Removed ib_config.h needs
      storage/innobase/include/Makefile.i:
        Expanded includes.
      storage/innobase/include/univ.i:
        Removed ib_config need
      storage/innobase/plug.in:
        Added support taken from configure.in for building Innodb
      fb47d658
    • unknown's avatar
      Merge lamia.home:/home/timka/mysql/src/4.1-bug-21456 · e3181c59
      unknown authored
      into  lamia.home:/home/timka/mysql/src/5.0-bug-21456
      
      
      mysql-test/r/distinct.result:
        Merge the fix for BUG#21456
      mysql-test/t/distinct.test:
        Merge the fix for BUG#21456
      sql/sql_select.cc:
        Merge the fix for BUG#21456
      e3181c59
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 9a770f53
      unknown authored
      into  example.com:/work/mysql-5.1-runtime
      
      
      9a770f53
    • unknown's avatar
      Fix for bug #20665 All commands supported in Stored Procedures · 7a37eeae
      unknown authored
      should work in Prepared Statements. Post-review changeset.
      
      Problem: There are some commands which are avaiable to be executed in SP
               but cannot be prepared. This patch fixes this and makes it possible
               prepare these statements.
      
      Changes: The commands later are made available in PS. RESET has been forbidden
               in SF/Trigger.
      
      Solution: All current server commands where checked and those missing (see later)
                we added. Tests for all of the commands with repeated executions were
                added - testing with SP, SF and PS.
      
      SHOW BINLOG EVENTS
      SHOW (MASTER | SLAVE) STATUS
      SHOW (MASTER | BINARY) LOGS
      SHOW (PROCEDURE | FUNCTION) CODE (parsable only in debug builds)
      SHOW CREATE (PROCEDURE | FUNCTION | EVENT | TABLE | VIEW)
      SHOW (AUTHORS | CONTRIBUTORS | WARNINGS | ERRORS)
      CHANGE MASTER
      RESET (MASTER | SLAVE | QUERY CACHE)
      SLAVE (START | STOP)
      CHECKSUM (TABLE | TABLES)
      INSTALL PLUGIN
      UNINSTALL PLUGIN
      CACHE INDEX
      LOAD INDEX INTO CACHE
      GRANT
      REVOKE
      KILL
      (CREATE | RENAME | DROP) DATABASE
      (CREATE | RENAME | DROP) USER
      FLUSH (TABLE | TABLES | TABLES WITH READ LOCK | HOSTS | PRIVILEGES |
             LOGS | STATUS | MASTER | SLAVE | DES_KEY_FILE | USER_RESOURCES)
      
      
      mysql-test/r/ps.result:
        update result
      mysql-test/r/ps_1general.result:
        update result
      mysql-test/r/ps_grant.result:
        update result
      mysql-test/r/sp-dynamic.result:
        update result
      mysql-test/t/ps.test:
        Add more statements, probably all currently missing which are possible in
        a SP but not preparable.
        Every statement is tested in a SP, in a SF and attempted to prepare.
      mysql-test/t/ps_1general.test:
        - Enable some of the statements, which are already possible in SP.
        - 1295 -> ER_UNSUPPORTED_PS
      mysql-test/t/ps_grant.test:
        Enable statements already possible in SP.
      sql/sp_head.cc:
        - Reorder to keep some alphabet order.
        - Add missing SHOW_SCHEDULER_STATUS.
      sql/sql_prepare.cc:
        Add possibility to prepare statements, which are already allowed in SP.
      7a37eeae
    • unknown's avatar
      Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by · 2baf2fdf
      unknown authored
      GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
      optimization because ORDER BY may be removed when GROUP BY/DISTINCT
      sorts as a side effect, e.g. in 
        SELECT DISTINCT <non-key-col>,<pk> FROM t1
        ORDER BY <non-key-col> DISTINCT
      must be removed before ORDER BY as if done the other way around
      it will remove both.
      
      
      mysql-test/r/distinct.result:
        Test for BUG#21456.
      mysql-test/t/distinct.test:
        Test for BUG#21456.
      sql/sql_select.cc:
        Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by
        
        GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
        optimization because ORDER BY may be removed when GROUP BY/DISTINCT
        sorts as a side effect.
      2baf2fdf
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin · d08dd523
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
      
      
      storage/csv/ha_tina.cc:
        merge later
      mysql-test/r/csv.result:
        manual merge
      mysql-test/t/csv.test:
        manual merge
      d08dd523
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 118677a2
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/handler.cc:
        manual merge
      118677a2
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 184e9f0c
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      184e9f0c
    • unknown's avatar
      ndb - sr - · 3841ca40
      unknown authored
        Fix so that expand_check2 is only run per fragment,
        as restore now works 1 fragment at a time (again)
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Fix so that expand_check2 is only run per fragment,
          as restore now works 1 fragment at a time (again)
      3841ca40