1. 08 Oct, 2004 2 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · d6424368
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      d6424368
    • unknown's avatar
      Fix simple/dirty read handling · c74e8a62
      unknown authored
      
      ndb/include/kernel/signaldata/TcKeyConf.hpp:
        A bit for differenciating between "real" tckey conf and simple read conf
      ndb/include/ndbapi/Ndb.hpp:
        Removed/ifdef's unused stuff
      ndb/include/ndbapi/NdbConnection.hpp:
        Added bitmask that keeps track of used nodes when
          a transaction can be dependant on several nodes
      ndb/include/ndbapi/NdbOperation.hpp:
        removed unused methods
      ndb/include/ndbapi/NdbReceiver.hpp:
        Tween execTCOPCONF to handle TcKeyConf::SimpleReadBit
      ndb/src/common/debugger/signaldata/TcKeyConf.cpp:
        Update printer
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        removed unused define
      ndb/src/ndbapi/NdbApiSignal.cpp:
        Fix length of TC_COMMITREQ
      ndb/test/ndbapi/testOperations.cpp:
        fix simple/dirty read
      c74e8a62
  2. 07 Oct, 2004 32 commits
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 1d7406c6
      unknown authored
      into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
      
      
      1d7406c6
    • unknown's avatar
      ha_ndbcluster.cc: · 992ce20f
      unknown authored
        merge error
      
      
      sql/ha_ndbcluster.cc:
        merge error
      992ce20f
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 05e45be5
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      05e45be5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 264b163e
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      264b163e
    • unknown's avatar
      ndb_alter_table.result, ndb_alter_table.test: · 1b991b1a
      unknown authored
        ...
      
      
      mysql-test/t/ndb_alter_table.test:
        ...
      mysql-test/r/ndb_alter_table.result:
        ...
      1b991b1a
    • unknown's avatar
      fixed bug where scan is not closed as it should · c2d6d2c0
      unknown authored
      c2d6d2c0
    • unknown's avatar
      Protect from use of NULL pointer · 23ed93f7
      unknown authored
      
      ndb/src/ndbapi/Ndb.cpp:
        Dont call trans->getTransactionId if trans is NULL.
      23ed93f7
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 4cf6ce7e
      unknown authored
      into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
      
      
      4cf6ce7e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b67205dd
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      b67205dd
    • unknown's avatar
      ha_innodb.cc: · ff879b93
      unknown authored
        Merge manually the InnoDB mysqldump -l crash patch (crash with LOCK TABLES ... LOCAL) from 4.0 to 4.1; some code cleanup
      
      
      sql/ha_innodb.cc:
        Merge manually the mysqldump -l crash pacth from 4.0 to 4.1; some code cleanup
      ff879b93
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 57fedc40
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      57fedc40
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9757a3a2
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      9757a3a2
    • unknown's avatar
      more order by fixes · 9acec233
      unknown authored
      9acec233
    • unknown's avatar
      Sned original NDB error as warning to client · 72d2e89b
      unknown authored
      
      sql/ha_ndbcluster.cc:
        Send original NDB error as warning to client so it can be retrieved with SHOW WARNINGS or SHOW ERRORS.
      72d2e89b
    • unknown's avatar
      Correct an 'unresolved identifier' problem caused by an "inline" · 3743df6e
      unknown authored
      function being used before it was defined - "forward" declaration
      was insufficient.
      
      
      innobase/lock/lock0lock.c:
        Compile problem on 'build', solved by moving the definition of
        'lock_rec_get_nth_bit' to the place of the ("forward") declaration.
        It is "inline", and now the body really appears before the first use.
      3743df6e
    • unknown's avatar
      Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is... · 77a56a6a
      unknown authored
      Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is set to 1 in test_if_skip_sort_order if we decide to optimize "order by" by uinsg index_read.
      
      
      mysql-test/r/ndb_index_ordered.result:
        Another test to check the use of "sorted" in combination with reset_bounds()
      mysql-test/t/ndb_index_ordered.test:
        Another test to check the use of "sorted" in combination with reset_bounds()
      sql/ha_ndbcluster.cc:
        Check that sorted is set to 0 or 1.
      sql/opt_range.cc:
        Initialise the sorted variable to zero QUICK_SELECT constructor.
      77a56a6a
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · a4475441
      unknown authored
      into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      a4475441
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d36d5a29
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      d36d5a29
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 · 9232c91d
      unknown authored
      
      client/mysqlimport.c:
        Auto merged
      myisam/mi_locking.c:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      9232c91d
    • unknown's avatar
      Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves · 0129f32b
      unknown authored
      differently when converting column to auto_increment in 4.1" with
      current tree.
      
      
      mysql-test/t/type_timestamp.test:
        Auto merged
      mysql-test/r/type_timestamp.result:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      0129f32b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5b3444d2
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      5b3444d2
    • unknown's avatar
      more order by for ndb · 1d7ae133
      unknown authored
      1d7ae133
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 92c90128
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      92c90128
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d8a0fbaf
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      d8a0fbaf
    • unknown's avatar
    • unknown's avatar
      Fix for bug #5915 "ALTER TABLE behaves differently when converting column · 34789efd
      unknown authored
      to auto_increment in 4.1".
      Now we are enforcing NO_AUTO_VALUE_ON_ZERO mode during ALTER TABLE only
      if we are converting one auto_increment column to another auto_increment
      column (this also includes most common case when we don't do anything
      with such column).
      
      Also now when we convert some column to TIMESTAMP NOT NULL column with
      ALTER TABLE we convert NULL values to current timestamp, (as we do this
      in INSERT). One can still get old behavior by setting system TIMESTAMP
      variable to 0.
      
      
      mysql-test/r/auto_increment.result:
        Added tests for ALTER TABLE converting columns containing NULL and 0
        values to AUTO_INCREMENT columns.
      mysql-test/r/type_timestamp.result:
        Removed test for creation of TIMESTAMP(19) columns (it is 4.0 specific).
        Added test for ALTER TABLE converting columns containing NULL values
        to TIMESTAMP columns.
      mysql-test/t/auto_increment.test:
        Added tests for ALTER TABLE converting columns containing NULL and 0
        values to AUTO_INCREMENT columns.
      mysql-test/t/type_timestamp.test:
        Removed test for creation of TIMESTAMP(19) columns (it is 4.0 specific).
        Added test for ALTER TABLE converting columns containing NULL values
        to TIMESTAMP columns.
      sql/field_conv.cc:
        Fix bug #5915 "ALTER TABLE behaves differently when converting column
        to auto_increment in 4.1". Also now when we are converting some column
        to TIMESTAMP column, we are converting NULL values to CURRENT_TIMESTAMP
        (as it was initially planned).
        
        do_copy_timestamp(): Fixed comment.
        do_copy_next_number(): We should also set auto_increment_field_not_null
          to FALSE if we have NULL in source field.
        Copy_field::set(): Moved setting of copy functions for TIMESTAMP and
          AUTO_INCREMENT fields to proper place (this was dead code before).
      sql/sql_table.cc:
        Fix for bug #5915 "ALTER TABLE behaves differently when converting column
        to auto_increment in 4.1".
        
        Instead of always forcing NO_AUTO_VALUE_ON_ZERO in ALTER TABLE it is
        better to do this only if we are converting one auto_increment column
        to another auto_increment column (this also includes most common case
        when we don't do anything with such column).
      34789efd
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4d52afcb
      unknown authored
      into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
      
      
      4d52afcb
    • unknown's avatar
      adder order by · 1f436734
      unknown authored
      1f436734
    • unknown's avatar
      After merge fixes · 96e7be58
      unknown authored
      Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
      
      
      include/hash.h:
        Added back function that's was used in 4.0
      mysql-test/r/delete.result:
        Update results after merge
      mysql-test/r/flush_table.result:
        Update results after merge
      mysql-test/r/func_str.result:
        Update results after merge
      mysql-test/r/handler.result:
        Update results after merge
        Change is big becasue in MySQL 4.1 you are not allowed to qualify the handler alias with a databasename
      mysql-test/r/multi_update.result:
        More startup cleanups
      mysql-test/r/rename.result:
        More startup-cleanups
      mysql-test/r/select.result:
        More startup cleanups
      mysql-test/r/show_check.result:
        More startup-cleanups
      mysql-test/t/ctype_latin1_de.test:
        Cleanup
      mysql-test/t/derived.test:
        Portability fix
      mysql-test/t/handler.test:
        Update results after merge
        Change is big becasue in MySQL 4.1 you are not allowed to qualify the handler alias with a databasename
      mysql-test/t/multi_update.test:
        More startup cleanups
      mysql-test/t/range.test:
        More comments
      mysql-test/t/rename.test:
        More startup cleanups
      mysql-test/t/select.test:
        More startup cleanups
      mysql-test/t/show_check.test:
        More startup cleanups
      mysql-test/t/type_timestamp.test:
        Add back test deleted during merge
      sql/item_cmpfunc.cc:
        After merge fixes
      sql/item_func.cc:
        Remove compiler warning
      sql/mysql_priv.h:
        After merge fixes
      sql/mysqld.cc:
        After merge fixes
      sql/sql_acl.cc:
        More debugging
      sql/sql_base.cc:
        After merge fixes
        (This fix was needed bacause of multi-table-update reopens tables)
      sql/sql_handler.cc:
        After merge fixes
      sql/sql_lex.h:
        After merge fixes
      sql/sql_select.cc:
        After merge fixes
      sql/sql_show.cc:
        After merge fixes
      sql/sql_table.cc:
        After merge fixes
        Simple cleanup of mysql_discard_or_import_tablespace
      sql/sql_update.cc:
        After merge fixes
        Rework mysql_multi_update to take into account derived tables.
      sql/sql_yacc.yy:
        After merge fixes
      96e7be58
    • unknown's avatar
      Don't show NDB$BLOB tables in SHOW TABLES · 7116e39f
      unknown authored
      
      sql/ha_ndbcluster.cc:
        Only add the NDB-table to list of files if it can be discovered AND sucessfully created on disk. This will make susre that NDB$BLOB tables does not show up in SHOW TABLES
      7116e39f
    • unknown's avatar
      Fix error message · 2906825f
      unknown authored
      
      ndb/src/kernel/vm/Configuration.cpp:
        Correct error message, it should indicate that it was not possible to connect to ndb_mgmd
      2906825f
    • unknown's avatar
      Clean up from Bar and Antony code review. Found an issue with the header file... · 62637c9d
      unknown authored
      Clean up from Bar and Antony code review. Found an issue with the header file were it could end up corrupted.
      
      
      sql/examples/ha_archive.cc:
        Cleanup from Bar's and Antony's code review. Meta file should not be system independent (so you can copy around the files as you like).
      sql/examples/ha_archive.h:
        No longer bother with storing the working version of the data files. Its unimportant while there is only one format.
      62637c9d
  3. 06 Oct, 2004 6 commits
    • unknown's avatar
      Merge build.mysql.com:/home/bk/mysql-4.0 · 1601646a
      unknown authored
      into build.mysql.com:/users/rburnett/mysql-4.0
      
      
      1601646a
    • unknown's avatar
      Enabled the writing of a pid file on Windows. · 10cd526d
      unknown authored
      mysqld.cc:
        Added call to create_pid_file to start_signal_handler on windows.  Also removed the #ifndef WINDOWS from two calls that deletes the pid file
      
      
      sql/mysqld.cc:
        Added call to create_pid_file to start_signal_handler on windows.  Also removed the #ifndef WINDOWS from two calls that deletes the pid file
      10cd526d
    • unknown's avatar
      Merge with 4.0 for 4.1 release · bbab9ec6
      unknown authored
      Noteworthy:
      - New HANDLER code
      - New multi-update-grant-check code
      - Table lock code in ha_innodb.cc was not applied
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
        Auto merged
      Build-tools/mysql-copyright-2:
        Auto merged
      acinclude.m4:
        Auto merged
      client/mysqladmin.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/myisam.h:
        Auto merged
      innobase/btr/btr0btr.c:
        Auto merged
      innobase/buf/buf0buf.c:
        Auto merged
      ltmain.sh:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fsp/fsp0fsp.c:
        Auto merged
      innobase/include/dict0dict.h:
        Auto merged
      innobase/include/row0mysql.h:
        Auto merged
      innobase/log/log0log.c:
        Auto merged
      innobase/log/log0recv.c:
        Auto merged
      innobase/pars/pars0opt.c:
        Auto merged
      innobase/row/row0row.c:
        Auto merged
      innobase/sync/sync0arr.c:
        Auto merged
      innobase/ut/ut0dbg.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/mi_close.c:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      myisam/mi_locking.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      mysql-test/r/delete.result:
        Auto merged
      mysql-test/r/func_if.result:
        Auto merged
      Build-tools/mysql-copyright:
        Merge with 4.0 (too most of the code from 4.0)
      Makefile.am:
        merge
      client/mysql.cc:
        Used 4.1 code
      configure.in:
        merge
      innobase/os/os0file.c:
        merge
      innobase/row/row0mysql.c:
        merge
      mysql-test/r/ctype_latin1_de.result:
        merge
      mysql-test/r/flush_table.result:
        merge
      mysql-test/r/func_str.result:
        merge
      mysql-test/r/handler.result:
        merge
      mysql-test/r/multi_update.result:
        merge
      mysql-test/r/type_timestamp.result:
        Removed testing of 'new' mode, as this is only relevant for 4.0
      mysql-test/r/update.result:
        merge
      mysql-test/t/delete.test:
        merge
      mysql-test/t/flush_table.test:
        merge
      mysql-test/t/func_str.test:
        merge
      mysql-test/t/handler.test:
        merge
      mysql-test/t/multi_update.test:
        merge
      mysql-test/t/type_timestamp.test:
        Removed testing of 'new' mode, as this is only relevant for 4.0
      mysql-test/t/update.test:
        merge
      mysys/errors.c:
        merge
      mysys/my_fstream.c:
        merge
      mysys/my_pread.c:
        merge
      mysys/my_write.c:
        merge
      mysys/mysys_priv.h:
        merge
      scripts/mysqlhotcopy.sh:
        merge
      sql/field.cc:
        Keep code from 4.1
      sql/field.h:
        Keep code from 4.1
      sql/ha_innodb.cc:
        Don't merge lock code from 4.0; Heikki will look at this
      sql/ha_myisam.cc:
        merge
      sql/handler.cc:
        merge
      sql/item_cmpfunc.cc:
        merge
      sql/item_cmpfunc.h:
        merge
      sql/item_strfunc.cc:
        merge
      sql/mysql_priv.h:
        merge
      sql/mysqld.cc:
        merge
      sql/protocol.cc:
        merge
      sql/records.cc:
        merge
      sql/repl_failsafe.cc:
        merge
      mysql-test/r/lock_multi.result:
        merge
      mysql-test/t/ctype_latin1_de.test:
        merge
      mysql-test/t/func_if.test:
        merge
      mysql-test/t/lock_multi.test:
        merge
      sql/repl_failsafe.h:
        merge
        Remove unnessessary header protection
      sql/slave.h:
        merge
      sql/sql_acl.cc:
        merge
      sql/sql_base.cc:
        merge
      sql/sql_cache.cc:
        auto merge
      sql/sql_class.cc:
        merge
      sql/sql_class.h:
        merge
      sql/sql_delete.cc:
        merge
      sql/sql_handler.cc:
        Get new HANDLER code into 4.1
      sql/sql_parse.cc:
        Keep old file
      sql/sql_repl.cc:
        merge
      sql/sql_repl.h:
        merge
      sql/sql_show.cc:
        merge
      sql/sql_table.cc:
        merge
      sql/sql_union.cc:
        Applied the examine_rows bug fix from 4.0 by hand
      sql/sql_update.cc:
        New multi-update-grant-check code from 4.0
      sql/sql_yacc.yy:
        New multi-update-grant-check code from 4.0
      sql/stacktrace.c:
        merge
      sql/table.h:
        merge
      bbab9ec6
    • unknown's avatar
      Code cleanups while doing review of pushed code · fe463106
      unknown authored
      
      myisam/mi_locking.c:
        More comments
      sql/mysql_priv.h:
        Change mode to uint (as it's a bitmap)
      sql/sql_handler.cc:
        Change mode to uint (as it's a bitmap)
        Fixed DBUG_PRINT to use same format as other MySQL code
      fe463106
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4a618a35
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb2
      
      
      BitKeeper/deleted/.del-ndb_subquery.result:
        Delete: mysql-test/r/ndb_subquery.result
      BitKeeper/deleted/.del-ndb_subquery.test:
        Delete: mysql-test/t/ndb_subquery.test
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/test/run-test/atrt-mysql-test-run:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      4a618a35
    • unknown's avatar
      NdbScanOperation.cpp: · f77811a2
      unknown authored
        fix for compile error in gcc.3.4.4
        and run error in gcc3.3.2
      
      
      ndb/src/ndbapi/NdbScanOperation.cpp:
        fix for compile error in gcc.3.4.4
        and run error in gcc3.3.2
      f77811a2