An error occurred fetching the project authors.
  1. 19 Oct, 2006 1 commit
    • unknown's avatar
      ndb - bug#23200 · d262020f
      unknown authored
        this changes lock taken during peek, to decrease likelyhood of transaction abort
        
      
      
      sql/ha_ndbcluster.cc:
        use exclusive lock in peek, as peek is used just before insert/update
      d262020f
  2. 05 Oct, 2006 3 commits
    • unknown's avatar
      BUG#23013 make INFORMATION_SCHEMA.FILES easily usable by other engines · ae4afbe0
      unknown authored
      sql/ha_ndbcluster.cc:
        update fill_files_table to match new way of doing things
      sql/mysql_priv.h:
        defines for INFORMATION_SCHEMA.FILES column numbers
        add init_fill_schema_files_row()
      sql/sql_show.cc:
        add init_fill_schema_files_row(TABLE*) to help engines with filling schema files.
      ae4afbe0
    • unknown's avatar
      ndb - bug#17929 · d7bb7cc5
      unknown authored
        guess which scan type to use in handler
      
      
      sql/ha_ndbcluster.cc:
        Add guessing of scan type when starting full-table-scan
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Add methods to check properties of a bitmap of columns
      storage/ndb/include/ndbapi/NdbScanOperation.hpp:
        Add DiskScanFlag
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Add aggregate of #disk columns
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Add #disk columns
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Add disk scan flag
      storage/ndb/tools/delete_all.cpp:
        Add tupscan/diskscan to delete_all
      d7bb7cc5
    • unknown's avatar
      Added license information display to output of plugins schema, and tagged all... · 76cdfbbd
      unknown authored
      Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 
      
      
      include/mysql/plugin.h:
        Adding license information.
      plugin/fulltext/plugin_example.c:
        License
      sql/ha_ndbcluster.cc:
        License
      sql/ha_partition.cc:
        License
      sql/handler.h:
        License
      sql/log.cc:
        License
      sql/sql_show.cc:
        Additional PLUIN display information
      storage/archive/ha_archive.cc:
        License information added
      storage/blackhole/ha_blackhole.cc:
        License information added
      storage/csv/ha_tina.cc:
        License Information
      storage/example/ha_example.cc:
        License information
      storage/federated/ha_federated.cc:
        License Information
      storage/heap/ha_heap.cc:
        License Information
      storage/innobase/handler/ha_innodb.cc:
        License Information
      storage/myisam/ha_myisam.cc:
        License Information
      storage/myisammrg/ha_myisammrg.cc:
        License Information
      76cdfbbd
  3. 02 Oct, 2006 1 commit
    • unknown's avatar
      BUG#18198: Partition function handling · 93f4daf1
      unknown authored
      Fixes of after review fixes
      
      
      mysql-test/r/partition_hash.result:
        Fixed test cases
      mysql-test/r/partition_range.result:
        Fixed test cases
      mysql-test/t/partition_range.test:
        Fixed test cases
      sql/ha_ndbcluster.cc:
        Fixed error printout to avoid complex character set code in print_error
      sql/ha_partition.cc:
        Fixed error printout to avoid complex character set code in print_error
      sql/partition_info.cc:
        Fixed error printout to avoid complex character set code in print_error
      sql/partition_info.h:
        Fixed error printout to avoid complex character set code in print_error
      sql/sql_partition.cc:
        indendentation fix
      93f4daf1
  4. 01 Oct, 2006 2 commits
    • unknown's avatar
      This patch makes ndbcluster_hton not static. I have a second patch for... · 0f3c3e2e
      unknown authored
      This  patch makes ndbcluster_hton not static. I have a second patch for ndbcluster_hton to be static, but I want to talk to Jonas first. 
      
      
      sql/ha_ndbcluster.cc:
        Can't quite make  it static yet :)
      sql/ha_ndbcluster_binlog.h:
        Moving bad extern replacement
      0f3c3e2e
    • unknown's avatar
      This patch updates to remove most global hton needs. Cleans up wrong message in partition. · 40bf7b0a
      unknown authored
      mysql-test/r/partition.result:
        Updated results
      sql/ha_ndbcluster.cc:
        Updated hton
      sql/ha_partition.cc:
        Removed need for global internal hton.
      sql/handler.cc:
        Removed need for global mrg
      sql/mysql_priv.h:
        Updated needs for global variables.
      sql/mysqld.cc:
        Removed needs around hton
      sql/partition_info.cc:
        Removed bug.... aka what happens if tables are neither?
      sql/share/errmsg.txt:
        Made error message more generic.
      sql/sql_cache.cc:
        Removed specific hton reference
      40bf7b0a
  5. 30 Sep, 2006 2 commits
    • unknown's avatar
      This patch adds handlerton passing to functions. NDB and Innodb still require... · 76b83865
      unknown authored
      This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
      Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call. 
      
      
      include/heap.h:
        Added new function
      sql/ha_ndbcluster.cc:
        Updated hanlderton functions
      sql/ha_ndbcluster_binlog.cc:
        Updated handlerton functions.
      sql/handler.cc:
        Updated handlerton functions.
      sql/handler.h:
        Updated hanlderton functions
      sql/log.cc:
        Updated handlerton functions
      sql/mysql_priv.h:
        Updated handlerton functions
      sql/mysqld.cc:
        Added Legacy handlerton functions
      sql/partition_info.cc:
        Added flag support for marking engines not compatible with partitioning
      sql/sql_cursor.cc:
        Updated hanlderton functions
      sql/sql_show.cc:
        Updated hanlderton functions
      sql/sql_tablespace.cc:
        Update for handlerton functions
      storage/archive/ha_archive.cc:
        Update for hanlderton functions
      storage/archive/ha_archive.h:
        Update for handlerton functions
      storage/blackhole/ha_blackhole.cc:
        Update for handlerton functions
      storage/csv/ha_tina.cc:
        Update for handlerton functions
      storage/csv/ha_tina.h:
        Update for handlerton functions
      storage/federated/ha_federated.cc:
        Updated for handlerton functions
      storage/federated/ha_federated.h:
        Updated for handlerton functions
      storage/heap/ha_heap.cc:
        Update for handlerton functions
      storage/heap/hp_panic.c:
        Update of function name
      storage/heap/hp_test1.c:
        Update of function name
      storage/heap/hp_test2.c:
        Update of function name.
      storage/innobase/handler/ha_innodb.cc:
        Update of function name
      storage/innobase/handler/ha_innodb.h:
        Update of function name
      storage/myisam/ha_myisam.cc:
        Update of function name.
      storage/myisammrg/ha_myisammrg.cc:
        Update of function name
      76b83865
    • unknown's avatar
      This removes the passing of global hton to engine instance. · 48d5b3bd
      unknown authored
      sql/ha_ndbcluster.cc:
        Removed global hton
      sql/ha_ndbcluster.h:
        Removed global hton need
      sql/ha_partition.cc:
        Removed global hton
      sql/ha_partition.h:
        Removed global hton
      sql/handler.cc:
        Removed global hton
      sql/handler.h:
        Removed global hton
      storage/archive/ha_archive.cc:
        Removed global hton
      storage/archive/ha_archive.h:
        Global hton removed
      storage/blackhole/ha_blackhole.cc:
        Global removed hton
      storage/blackhole/ha_blackhole.h:
        Global hton removal
      storage/csv/ha_tina.cc:
        Global hton removal
      storage/csv/ha_tina.h:
        Removed global removed
      storage/example/ha_example.cc:
        Global removed hton
      storage/example/ha_example.h:
        Global removed hton
      storage/federated/ha_federated.cc:
        Global removed hton
      storage/federated/ha_federated.h:
        Global removed hton
      storage/heap/ha_heap.cc:
        Global removed hton
      storage/heap/ha_heap.h:
        Global removed hton
      storage/innobase/handler/ha_innodb.cc:
        Global removed hton
      storage/innobase/handler/ha_innodb.h:
        Removed global hton
      storage/myisam/ha_myisam.cc:
        Globally removed hton
      storage/myisam/ha_myisam.h:
        Globally removed hton
      storage/myisammrg/ha_myisammrg.cc:
        Globally removed hton
      storage/myisammrg/ha_myisammrg.h:
        Globaly removed hton
      48d5b3bd
  6. 27 Sep, 2006 1 commit
    • unknown's avatar
      Removed Field (this came in as an idea from a previous patch by Serg) · 057f98b3
      unknown authored
      include/mysql/plugin.h:
        Field Removed
      sql/ha_ndbcluster.cc:
        Field Removed
      sql/ha_partition.cc:
        Field Removed
      sql/log.cc:
        Removed Field
      storage/archive/ha_archive.cc:
        Removed Field
      storage/blackhole/ha_blackhole.cc:
        Removed Field
      storage/csv/ha_tina.cc:
        Removed Field
      storage/example/ha_example.cc:
        Removed Field
      storage/federated/ha_federated.cc:
        Removed Field
      storage/heap/ha_heap.cc:
        Removed Field
      storage/innobase/handler/ha_innodb.cc:
        Removed Field
      storage/myisam/ha_myisam.cc:
        Removed Field
      storage/myisammrg/ha_myisammrg.cc:
        Removed Field
      057f98b3
  7. 21 Sep, 2006 1 commit
  8. 18 Sep, 2006 1 commit
    • unknown's avatar
      BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS, · 6434e352
      unknown authored
      Change things around so that we add a row for each log file group that lists
      the free space for that log file group.
      
      
      client/mysqldump.c:
        dump logfile groups correctly (ignore row for the log file group itself)
      mysql-test/r/ndb_dd_dump.result:
        update results with new row for log file groups
      sql/ha_ndbcluster.cc:
        for fill_files_table:
        - set null bits properly
        - add rows for log file groups with free undo space.
      sql/sql_show.cc:
        make most I_S.FILES columns nullable to better fit with reality.
      6434e352
  9. 15 Sep, 2006 2 commits
    • unknown's avatar
      This changes the order of the universe, black is now the new white. · d79485a9
      unknown authored
      In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database. 
      
      
      include/mysql/plugin.h:
        Optional to pass parameter now to init and deinit functions
      sql/ha_ndbcluster.cc:
        Cleanup, handlerton is now a pointer.
      sql/ha_ndbcluster_binlog.cc:
        Cleanup (handlerton is now a pointer)
      sql/ha_ndbcluster_binlog.h:
        Cleanup (handlerton is now a pointer)
      sql/ha_partition.cc:
        Cleaned up handlerton change
      sql/handler.cc:
        Cheanup of handlerton change
      sql/item_sum.cc:
        Cleanedup of handlerton change
      sql/log.cc:
        Cleanup of handlerton change
      sql/mysql_priv.h:
        Reverted patch for variables (what would have happen previously if a have_ would have been called that was dynamically loaded? boom!)
      sql/mysqld.cc:
        Cleanup of handlerton changes and reverted have variable patch
      sql/partition_info.cc:
        Cleanup of handlerton (we need to clean this up a bit more).
      sql/set_var.cc:
        Cleanup related to handlerton changes
      sql/sql_cache.cc:
        Handlerton changes cleanup
      sql/sql_insert.cc:
        Handlerton changes cleanup.
      sql/sql_partition.cc:
        Handlerton cleanup changes
      sql/sql_plugin.cc:
        Handlerton changes.
        
        init() can now be controlled by a plugin specific startup. 
        
        There was also an issue with how we deinited the status variables. It should have been occuring before we shut down the engines.
      sql/sql_select.cc:
        Handlerton cleanup changes
      sql/sql_show.cc:
        Handlerton cleanup changes
      sql/sql_table.cc:
        Handlerton cleanup changes
      sql/table.cc:
        Cleanup
      storage/archive/ha_archive.cc:
        Cleanup
      storage/archive/ha_archive.h:
        Cleanup
      storage/blackhole/ha_blackhole.cc:
        Cleanup
      storage/csv/ha_tina.cc:
        Cleanup
      storage/example/ha_example.cc:
        Cleanup
      storage/federated/ha_federated.cc:
        Cleanup
      storage/heap/ha_heap.cc:
        Cleanup
      storage/innobase/handler/ha_innodb.cc:
        Cleanup
      storage/myisam/ha_myisam.cc:
        Cleanup
      storage/myisammrg/ha_myisammrg.cc:
        Cleanup
      d79485a9
    • unknown's avatar
  10. 13 Sep, 2006 1 commit
  11. 12 Sep, 2006 1 commit
  12. 05 Sep, 2006 2 commits
    • unknown's avatar
    • unknown's avatar
      Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0". · a0b7b242
      unknown authored
      In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
      only NDB wanted that. Users and trainers complained that it affected
      InnoDB and was a change compared to 4.1 where only NDB autocommitted.
      To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
      ha_ndbcluster::external_lock().
      The result is that LOAD DATA INFILE commits all uncommitted changes
      of NDB if this is an NDB table, its own changes if this is an NDB
      table, but does not affect other engines.
      Note: even though there is no "commit the full transaction at end"
      anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
      problems per a comment of Pem).
      Note: ha_ndbcluster::has_transactions() does not give reliable results
      because it says "yes" even if transactions are disabled in this engine...
      
      
      sql/ha_ndbcluster.cc:
        NDB wants to do autocommit if this is LOAD DATA INFILE.
        For this to not affect all other engines, we move the logic
        inside ha_ndbcluster.
      sql/sql_load.cc:
        This ha_enable_transaction() in mysql_load() forced an autocommit
        in all engines, while only NDB wants to do that.
        So we move the logic inside ha_ndbcluster.cc.
      mysql-test/include/loaddata_autocom.inc:
        test for engines to see if they autocommit or not in LOAD DATA INFILE
      mysql-test/r/loaddata_autocom_innodb.result:
        result for InnoDB (no autocommit)
      mysql-test/r/loaddata_autocom_ndb.result:
        result for NDB (autocommit)
      mysql-test/r/rpl_ndb_innodb_trans.result:
        result for InnoDB+NDB transactions. Observe that when ROLLBACK
        cannot rollback the LOAD DATA INFILE in NDB it issues warning 1196
        as appropriate.
      mysql-test/t/loaddata_autocom_innodb.test:
        test that InnoDB does not autocommit in LOAD DATA INFILE.
      mysql-test/t/loaddata_autocom_ndb.test:
        test that NDB does autocommit in LOAD DATA INFIL
      mysql-test/t/rpl_ndb_innodb_trans-slave.opt:
        need to tell the slave to use innodb
      mysql-test/t/rpl_ndb_innodb_trans.test:
        test of transactions mixing NDB and InnoDB. To see if ROLLBACK
        rolls back in both engines, with the exception of LOAD DATA INFILE
        which does not roll back NDB: we see that a LOAD DATA INFILE in NDB
        commits all what has been done in NDB so far, commits its changes,
        but does not commit in other engines.
      a0b7b242
  13. 30 Aug, 2006 4 commits
    • unknown's avatar
      2dfaa669
    • unknown's avatar
      Bug#20573 · 2233201b
      unknown authored
        "strict mode: inserts autogenerated auto_increment value bigger than max"
        Strict mode should fail if autoincrement value is out of range
      
      
      include/my_base.h:
        Add new handler error codes
      sql/ha_berkeley.cc:
        handle error in update_auto_increment()
      sql/ha_heap.cc:
        handle error in update_auto_increment()
      sql/ha_innodb.cc:
        handle error in update_auto_increment()
      sql/ha_myisam.cc:
        handle error in update_auto_increment()
      sql/ha_myisammrg.cc:
        handle error in update_auto_increment()
      sql/ha_ndbcluster.cc:
        handle error in update_auto_increment()
      sql/handler.cc:
        return error from handler::update_auto_increment()
      sql/handler.h:
        change return type of handler::update_auto_increment() to int
      sql/share/errmsg.txt:
        new error message for auto-increment
      mysql-test/include/strict_autoinc.inc:
        New BitKeeper file ``mysql-test/include/strict_autoinc.inc''
      mysql-test/r/strict_autoinc_1myisam.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_1myisam.result''
      mysql-test/r/strict_autoinc_2innodb.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_2innodb.result''
      mysql-test/r/strict_autoinc_3heap.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_3heap.result''
      mysql-test/r/strict_autoinc_4bdb.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_4bdb.result''
      mysql-test/r/strict_autoinc_5ndb.result:
        New BitKeeper file ``mysql-test/r/strict_autoinc_5ndb.result''
      mysql-test/t/strict_autoinc_1myisam.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_1myisam.test''
      mysql-test/t/strict_autoinc_2innodb.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_2innodb.test''
      mysql-test/t/strict_autoinc_3heap.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_3heap.test''
      mysql-test/t/strict_autoinc_4bdb.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_4bdb.test''
      mysql-test/t/strict_autoinc_5ndb.test:
        New BitKeeper file ``mysql-test/t/strict_autoinc_5ndb.test''
      2233201b
    • unknown's avatar
      This pulls two function calls which should have been handlerton calls out of handler.cc. · d7de5c34
      unknown authored
      sql/ha_ndbcluster.cc:
        Adding in new handlerton calls.
      sql/handler.cc:
        Calls directly made to NDB have been removed.
      sql/handler.h:
        Two additional handlerton structure functions.
      d7de5c34
    • unknown's avatar
      NDBAPI cleanup · 3dcf8673
      unknown authored
      3dcf8673
  14. 25 Aug, 2006 1 commit
    • 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
  15. 22 Aug, 2006 3 commits
    • unknown's avatar
      This changest: · 977cd20a
      unknown authored
      Plugins now when compiled or not compiled work correctly with status variables. 
      Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster)
      A few Makefile cleanups. 
      
      
      sql/ha_innodb.cc:
        Cleanup to make status variables directly in engine
      sql/ha_ndbcluster.cc:
        Engine interface now has variables for status
      sql/handler.cc:
        handler now makes sure to init status variables
      sql/mysqld.cc:
        Removed status variable hacks
      sql/sql_delete.cc:
        Removed include file that was not required
      storage/myisam/Makefile.am:
        Cleaned up line lengths and addded additional include to not install.
      storage/myisam/ha_myisam.cc:
        Removed double plugin include
      977cd20a
    • unknown's avatar
      correct merge · 9c293634
      unknown authored
      9c293634
    • unknown's avatar
      ndb - post-merge fix 5.0 to 5.0-ndb: number of frags if --without-big-tables · 06b1f15d
      unknown authored
      sql/ha_ndbcluster.cc:
        calculate frags with (ulonglong)max_rows in case --without-big-tables
      06b1f15d
  16. 17 Aug, 2006 1 commit
  17. 15 Aug, 2006 4 commits
    • unknown's avatar
      Fix for bug #21059 Server crashes on join query with large dataset with NDB... · 6464d62c
      unknown authored
      Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range
      
      
      
      6464d62c
    • unknown's avatar
      ndb - bug#20708 · 4eb44935
      unknown authored
        init ndb_cache_check_time and honor value in my.cnf
      
      
      sql/ha_ndbcluster.cc:
        init ndb_cache_check_time and honor value in my.cnf
      4eb44935
    • unknown's avatar
      ndb_lock.test, ndb_lock.result: · 87b7363c
      unknown authored
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      
      
      mysql-test/r/ndb_lock.result:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      mysql-test/t/ndb_lock.test:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ndb/include/ndbapi/NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.cc:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.h:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      87b7363c
    • unknown's avatar
      ndb_lock.test, ndb_lock.result: · cd49f996
      unknown authored
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      
      
      ndb/include/ndbapi/NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.h:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.cc:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      mysql-test/r/ndb_lock.result:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      mysql-test/t/ndb_lock.test:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      cd49f996
  18. 11 Aug, 2006 2 commits
  19. 10 Aug, 2006 1 commit
    • unknown's avatar
      BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables · e34496e5
      unknown authored
      allow handler::info to return an error code (that will be returned to the user)
      
      
      sql/ha_berkeley.cc:
        update handler::info interface to return int
      sql/ha_berkeley.h:
        update handler::info interface to return int
      sql/ha_heap.cc:
        update handler::info interface to return int
      sql/ha_heap.h:
        update handler::info interface to return int
      sql/ha_innodb.cc:
        update handler::info interface to return int
      sql/ha_innodb.h:
        update handler::info interface to return int
      sql/ha_myisam.cc:
        update handler::info interface to return int
      sql/examples/ha_archive.cc:
        update handler::info interface to return int
      sql/examples/ha_archive.h:
        update handler::info interface to return int
      sql/examples/ha_example.cc:
        update handler::info interface to return int
      sql/examples/ha_example.h:
        update handler::info interface to return int
      sql/examples/ha_tina.cc:
        update handler::info interface to return int
      sql/examples/ha_tina.h:
        update handler::info interface to return int
      sql/ha_myisam.h:
        update handler::info interface to return int
      sql/ha_myisammrg.cc:
        update handler::info interface to return int
      sql/ha_myisammrg.h:
        update handler::info interface to return int
      sql/ha_ndbcluster.cc:
        update handler::info interface to return int
      sql/ha_ndbcluster.h:
        update handler::info interface to return int
      sql/handler.h:
        update handler::info interface to return int
      sql/opt_sum.cc:
        If we get an error when using handler::info to get count(*),
        print and return the error.
      sql/sql_select.cc:
        if error, set fatal error.
      e34496e5
  20. 08 Aug, 2006 1 commit
    • unknown's avatar
      bug #18184 SELECT ... FOR UPDATE does not work..: Added lockTuple call in close_scan · 01543ee2
      unknown authored
      sql/ha_ndbcluster.cc:
        bug #18184  SELECT ... FOR UPDATE does not work..: Added lockTuple call in closeScan
      mysql-test/r/ndb_lock.result:
        bug #18184  SELECT ... FOR UPDATE does not work..: Added lockTuple call in closeScan
      mysql-test/t/ndb_lock.test:
        bug #18184  SELECT ... FOR UPDATE does not work..: Added lockTuple call in closeScan
      01543ee2
  21. 07 Aug, 2006 2 commits
  22. 02 Aug, 2006 1 commit
    • unknown's avatar
      Bug#18775 - Temporary table from alter table visible to other threads · ef976d20
      unknown authored
      Continued implementation of WL#1324 (table name to filename encoding)
      
      The intermediate (not temporary) files of the new table
      during ALTER TABLE was visible for SHOW TABLES. These
      intermediate files are copies of the original table with
      the changes done by ALTER TABLE. After all the data is
      copied over from the original table, these files are renamed 
      to the original tables file names. So they are not temporary 
      files. They persist after ALTER TABLE, but just with another 
      name.
      
      In 5.0 the intermediate files are invisible for SHOW TABLES
      because all file names beginning with "#sql" were suppressed.
      
      This failed since 5.1.6 because even temporary table names were
      converted when making file names from them. The prefix became
      converted to "@0023sql". Converting the prefix during SHOW TABLES
      would suppress the listing of user tables that start with "#sql".
      
      The solution of the problem is to continue the implementation of
      the table name to file name conversion feature. One requirement
      is to suppress the conversion for temporary table names.
      
      This change is straightforward for real temporary tables as there
      is a function that creates temporary file names.
      
      But the generated path names are located in TMPDIR and have no
      relation to the internal table name. This cannot be used for
      ALTER TABLE. Its intermediate files need to be in the same
      directory as the old table files. And it is necessary to be
      able to deduce the same path from the same table name repeatedly.
      
      Consequently the intermediate table files must be handled like normal
      tables. Their internal names shall start with tmp_file_prefix
      (#sql) and they shall not be converted like normal table names.
      
      I added a flags parameter to all relevant functions that are
      called from ALTER TABLE. It is used to suppress the conversion
      for the intermediate table files.
      
      The outcome is that the suppression of #sql in SHOW TABLES
      works again. It does not suppress user tables as these are
      converted to @0023sql on file level.
      
      This patch does also fix ALTER TABLE ... RENAME, which could not 
      rename a table with non-ASCII characters in its name.
      
      It does also fix the problem that a user could create a table like
      `#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
      ID of some other thread, which prevented this thread from running 
      ALTER TABLE.
      
      Some of the above problems are mentioned in Bug 1405, which can
      be closed with this patch.
      
      This patch does also contain some minor fixes for other forgotten
      conversions. Still known problems are reported as bugs 21370,
      21373, and 21387.
      
      
      mysql-test/r/alter_table.result:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added test results.
      mysql-test/r/backup.result:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added test results.
      mysql-test/r/repair.result:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added test results.
      mysql-test/t/alter_table.test:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added test cases.
      mysql-test/t/backup.test:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added test cases.
      mysql-test/t/repair.test:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added a test case.
      sql/ha_myisam.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added missing table name mapping calls to backup() and restore().
      sql/ha_myisammrg.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/ha_ndbcluster.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/ha_ndbcluster_binlog.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/ha_ndbcluster_binlog.h:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Removed unnecessary check for wrong temp file prefix.
      sql/mysql_priv.h:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Extended quick_rm_table(), mysql_rename_table(), and
        build_table_filename() by an flags argument, which can indicate
        temporary table names that should not be converted.
        Added symbolic flag values.
      sql/sql_acl.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/sql_base.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Fixed a comment.
        Added DBUG calls.
      sql/sql_db.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/sql_delete.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/sql_insert.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/sql_partition.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/sql_rename.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/sql_show.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Reverted the former fix for this bug. tmp_file_prefix is now used
        verbatim in the comparison of file names.
      sql/sql_table.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added a check for a tmp_file_prefix file name to
        filename_to_tablename(). These names are now accepted without
        conversion.
        Extended quick_rm_table(), mysql_rename_table(), and
        build_table_filename() by an flags argument, which can indicate
        temporary table names that should not be converted.
        Removed the table to file name conversion from
        build_tmptable_filename().
        Disabled REPAIR TABLE ... USE_FRM for temporary tables.
        Added the forgotten conversion to mysql_alter_table() for the case
        of ALTER TABLE ... RENAME.
        Added comments and DBUG calls.
      sql/sql_trigger.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/sql_view.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Added an zero argument for the new 'flags' parameter.
      sql/table.cc:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Replaced a literal ".frm" by reg_ext.
        Added DBUG calls.
      storage/innobase/row/row0mysql.c:
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Changed back the encoded temp file prefix to #sql.
      ef976d20
  23. 13 Jul, 2006 1 commit
    • unknown's avatar
      Post-merge fixes. · 3657f346
      unknown authored
      mysql-test/mysql-test-run.sh:
        A post-merge fix (apply a change lost during the merge).
      sql/ha_ndbcluster.cc:
        A post-merge fix: resolve a merge error.
      sql/item.cc:
        Fix a merge error.
      sql/item_xmlfunc.cc:
        Use the new signature of agg_arg_charsets.
      3657f346
  24. 09 Jul, 2006 1 commit
    • unknown's avatar
      WL#3146 "less locking in auto_increment": · 60272e75
      unknown authored
      this is a cleanup patch for our current auto_increment handling:
      new names for auto_increment variables in THD, new methods to manipulate them
      (see sql_class.h), some move into handler::, causing less backup/restore
      work when executing substatements. 
      This makes the logic hopefully clearer, less work is is needed in
      mysql_insert().
      By cleaning up, using different variables for different purposes (instead
      of one for 3 things...), we fix those bugs, which someone may want to fix
      in 5.0 too:
      BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
      statement-based"
      BUG#20341 "stored function inserting into one auto_increment puts bad
      data in slave"
      BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
      (now if a row is updated, LAST_INSERT_ID() will return its id)
      and re-fixes:
      BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
      (already fixed differently by Ramil in 4.1)
      Test of documented behaviour of mysql_insert_id() (there was no test).
      The behaviour changes introduced are:
      - LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
      successfully inserted", instead of "the first autogenerated auto_increment
      value if any row was successfully inserted", see auto_increment.test.
      Same for mysql_insert_id(), see mysql_client_test.c.
      - LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
      UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
      mysql_client_test.c.
      - LAST_INSERT_ID() does not change if no autogenerated value was successfully 
      inserted (it used to then be 0), see auto_increment.test.
      - if in INSERT SELECT no autogenerated value was successfully inserted,
      mysql_insert_id() now returns the id of the last inserted row (it already
      did this for INSERT VALUES), see mysql_client_test.c.
      - if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
      (it already did this for INSERT VALUES), see mysql_client_test.c.
      - NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
      the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
      influences not only the first row now.
      
      Additionally, when unlocking a table we check that the thread is not keeping
      a next_insert_id (as the table is unlocked that id is potentially out-of-date);
      forgetting about this next_insert_id is done in a new
      handler::ha_release_auto_increment().
      
      Finally we prepare for engines capable of reserving finite-length intervals
      of auto_increment values: we store such intervals in THD. The next step
      (to be done by the replication team in 5.1) is to read those intervals from
      THD and actually store them in the statement-based binary log. NDB
      will be a good engine to test that.
      
      
      mysql-test/extra/binlog_tests/binlog.test:
        Testing that if INSERT_ID is set to a value too big for the
        column's type, the binlogged INSERT_ID is the truncated value
        (important if slave has a column of a "wider" numeric type).
        Testing binlogging of INSERT_ID with INSERT DELAYED, to be sure that 
        we binlog an INSERT_ID event only for the delayed rows which use one.
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        Testcase for BUG#20339 "stored procedure using
        LAST_INSERT_ID() does not replicate statement-based".
        Testcase for BUG#20341 "stored function inserting into one
        auto_increment puts bad data in slave".
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Test that LOAD DATA INFILE sets a value for a future LAST_INSERT_ID().
      mysql-test/r/auto_increment.result:
        behaviour change: when INSERT totally fails (not even succeeds
        partially and then rolls back), don't change last_insert_id().
        Behaviour change: LAST_INSERT_ID() is now the first successfully inserted,
        autogenerated, id.
        Behaviour change: if INSERT ON DUPLICATE KEY UPDATE, if the table has auto_increment
        and a row is updated, then LAST_INSERT_ID() returns the id of this row.
      mysql-test/r/binlog_row_binlog.result:
        result update
      mysql-test/r/binlog_stm_binlog.result:
        result update
      mysql-test/r/insert.result:
        result update
      mysql-test/r/rpl_insert_id.result:
        result update
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/r/rpl_ndb_auto_inc.result:
        ndb's behaviour is now like other engines wrt SET INSERT_ID
        in a multi-row INSERT:
        - with INSERT IGNORE: the id passed in SET INSERT_ID is re-used until
        a row succeeds.
        - generally, SET INSERT_ID sets the first value and other values are
        simply computed from this first value, instead of previously where
        the 2nd and subsequent values where not influenced by SET INSERT_ID;
        this good change is due to the removal of "thd->next_insert_id=0"
        from ha_ndbcluster.
      mysql-test/t/auto_increment.test:
        A testcase of BUG#19243: if ON DUPLICATE KEY UPDATE updates a row,
        LAST_INSERT_ID() now returns the id of the row.
        Test of new behaviour of last_insert_id() when no autogenerated value was
        inserted, or when only some autogenerated value (not the first of them) was
        inserted.
      mysql-test/t/insert.test:
        testing INSERT IGNORE re-using generated values
      sql/ha_federated.cc:
        update for new variables.
      sql/ha_ndbcluster.cc:
        handler::auto_increment_column_changed not needed, equivalent to
        (insert_id_for_cur_row > 0).
        thd->next_insert_id=0 not needed anymore; it was used to force
        handler::update_auto_increment() to call ha_ndbcluster::get_auto_increment()
        for each row of a multi-row INSERT, now this happens naturally
        because NDB says "I have reserved you *one* value" in get_auto_increment(),
        so handler::update_auto_increment() calls again for next row.
      sql/handler.cc:
        More comments, use of new methods and variables. Hopes to be clearer
        than current code.
        thd->prev_insert_id not in THD anymore: it is managed locally by inserters
        (like mysql_insert()).
        THD::clear_next_insert_id is now equivalent to
        handler::next_insert_id > 0.
        get_auto_increment() reserves an interval of values from the engine,
        uses this interval for next rows of the statement, until interval
        is exhausted then it asks for another interval (of a bigger size
        than the first one; size doubles until reaching 65535 then it stays constant).
        If doing statement-based binlogging, intervals are remembered in a list
        for storage in the binlog.
        For "forced" insert_id values (SET INSERT_ID or replication slave),
        forced_auto_inc_intervals is non-empty and the handler takes its intervals
        from there, without calling get_auto_increment().
        ha_release_auto_increment() resets the handler's auto_increment variables;
        it calls release_auto_increment() which is handler-dependent and
        serves to return to the engine any unused tail of the last used
        interval.
        If ending a statement, next_insert_id>0 means that autoinc values have been
        generated or taken from the master's binlog (in a replication slave) so
        we clear those values read from binlog, so that next top- or sub-
        statement does not use them.
      sql/handler.h:
        handler::auto_increment_changed can be replaced by
        (handler::insert_id_for_cur_row > 0).
        THD::next_insert_id moves into handler (more natural, and prepares
        for the day when we'll support a single statement inserting into
        two tables - "multi-table INSERT" like we have UPDATE - will this
        happen?).
        This move makes the backup/restore of THD::next_insert_id when entering
        a substatement unneeded, as each substatement has its own handler
        objects.
      sql/item_func.cc:
        new names for variables.
        For the setting of what mysql_insert_id() will return to the client,
        LAST_INSERT_ID(X) used to simply pretend that the generated autoinc
        value for the current row was X, but this led to having no reliable
        way to know the really generated value, so we now have a bool:
        thd->arg_of_last_insert_id_function which enables us to know that
        LAST_INSERT_ID(X) was called (and then X can be found in
        thd->first_successful_insert_id_in_prev_stmt).
      sql/log.cc:
        new variable names for insert_ids. Removing some unused variables in the slow
        log.
      sql/log_event.cc:
        new variable names, comments. Preparing for when master's won't binlog
        LAST_INSERT_ID if it was 0.
      sql/set_var.cc:
        new variable names.
        The last change repeats how Bar fixed BUG#20392
        "INSERT_ID session variable has weird value" in 5.0.
      sql/sql_class.cc:
        new variables for insert_id. In THD::cleanup_after_query() we fix
        BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
        statement-based" (will one want to fix it in 5.0?). Many comments
        about what stored functions do to auto_increment.
        In reset|restore_sub_statement_state(), we need to backup less
        auto_inc variables as some of them have moved to the handler;
        we backup/restore those which are about the current top- or sub-
        statement, *not* those about the statement-based binlog
        (which evolve as the top- and sub-statement execute).
        Because we split THD::last_insert_id into 
        THD::first_successful_insert_id_in_prev_stmt and
        THD::auto_inc_intervals_for_binlog (among others), we fix
        BUG#20341 "stored function inserting into one auto_increment
        puts bad data in slave": indeed we can afford to not backup/restore
        THD::auto_inc_intervals_for_binlog (which fixes the bug) while still
        backing up / restoring THD::first_successful_insert_id_in_prev_stmt
        (ensuring that the top-level LAST_INSERT_ID() is not affected by INSERTs
        done by sub-statements, as is desirable and tested in rpl_insert_id.test).
      sql/sql_class.h:
        new variables and methods for auto_increment.
        Some THD members move into handler (those which are really about
        the table being inserted), some stay in THD (those which are
        about what a future LAST_INSERT_ID() should return, or about
        what should be stored into the statement-based binlog).
        THD::next_insert_id moves to handler::.
        THD::clear_next_insert_id removed (had become equivalent
        to next_insert_id > 0).
        THD::last_insert_id becomes four:
        THD::first_successful_insert_id_in_cur_stmt,
        THD::auto_inc_intervals_for_binlog,
        handler::insert_id_for_cur_row,
        THD::first_successful_insert_id_in_prev_stmt.
        THD::current_insert_id becomes:
        THD::first_successful_insert_id_in_prev_stmt_for_binlog
        THD::prev_insert_id is removed, handler can just use
        handler::insert_id_for_cur_row instead (which is more accurate:
        for the first row, prev_insert_id was set before get_auto_increment
        was called, so was 0, causing a call to
        get_auto_increment() for the 2nd row if the 1st row fails;
        here we don't need the call as insert_id_for_cur_row has
        the value of the first row).
        THD::last_insert_id_used becomes: stmt_depends_on_first_row_in_prev_stmt
        THD::insert_id_used is removed (equivalent to
        auto_inc_intervals_for_binlog non empty).
        The interval returned by get_auto_increment() and currently being
        consumed is handler::auto_inc_interval_for_cur_row.
        Comments to explain each of them.
        select_insert::last_insert_id becomes autoinc_value_of_last_inserted_row.
      sql/sql_insert.cc:
        the "id" variable is not changed for each row now; it used to compensate for
        this contradiction:
        - thd->last_insert_id supposed job was to keep the id of the first row
        - but it was updated for every row
        - so mysql_insert() made sure to catch its first value and restore it at the end of stmt.
        Now THD keeps the first value in first_successful_insert_id_in_cur_stmt,
        and value of the row in insert_id_for_cur_row. So "id" only serves to fill
        mysql_insert_id(), as depending on some conditions, "id" must be different
        values.
        Prev_insert_id moves from THD to write_record().
        We now set LAST_INSERT_ID() in ON DUPLICATE KEY UPDATE too (BUG#19243).
        In an INSERT DELAYED, we still "reset auto-increment caching" but differently
        (by calling ha_release_auto_increment()).
      sql/sql_load.cc:
        no need to fiddle with "id", THD maintains
        THD::first_successful_insert_id_in_cur_stmt by itself and correctly now.
        ha_release_auto_increment() is now (logically) called before we unlock
        the table.
      sql/sql_parse.cc:
        update to new variable names.
        Assertion that reset_thd_for_next_command() is not called for every
        substatement of a routine (I'm not against it, but if we do this change,
        statement-based binlogging needs some adjustments).
      sql/sql_select.cc:
        update for new variable names
      sql/sql_table.cc:
        next_insert_id not needed in mysql_alter_table(), THD manages.
      sql/sql_update.cc:
        update for new variable names.
        Even though this is UPDATE, an insert id can be generated (by
        LAST_INSERT_ID(X)) and should be recorded because mysql_insert_id() wants
        to know about it.
      sql/structs.h:
        A class for "discrete" intervals (intervals of integer numbers with a certain
        increment between them): Discrete_interval, and a class for a list of such
        intervals: Discrete_intervals_list
      tests/mysql_client_test.c:
        tests of behaviour of mysql_insert_id(): there were no such tests, while in
        our manual we document its behaviour. In comments you'll notice the behaviour
        changes introduced (there are 5).
      60272e75