1. 31 Aug, 2007 1 commit
  2. 30 Aug, 2007 5 commits
    • unknown's avatar
      Bug#20872 master*.err: miscellaneous error messages · 06d1c628
      unknown authored
      
      sql/ha_ndbcluster.cc:
        Bug#20872 master*.err: miscellaneous error messages
        - only allocate share if fully successfull
      sql/ha_ndbcluster_binlog.cc:
        Bug#20872 master*.err: miscellaneous error messages
        - only allocate share if fully successfull
        - no need to print error, my_errno is set
      sql/ha_ndbcluster_binlog.h:
        Bug#20872 master*.err: miscellaneous error messages
        - only allocate share if fully successfull
      06d1c628
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · bfa05f52
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      bfa05f52
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 77f2400a
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testIndex.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        manual merge
      storage/ndb/src/ndbapi/ndberror.c:
        manual merge
      storage/ndb/test/run-test/daily-basic-tests.txt:
        manual merge
      77f2400a
    • unknown's avatar
      Bug#20872 master*.err: miscellaneous error messages · cfb1ba01
      unknown authored
      
      sql/ha_ndbcluster.cc:
        remove warning for table exists in mysqld error log
      sql/ha_ndbcluster_binlog.cc:
        remove warning for table exists in mysqld error log
      cfb1ba01
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 4ad9539a
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
      
      
      4ad9539a
  3. 29 Aug, 2007 5 commits
  4. 28 Aug, 2007 13 commits
  5. 27 Aug, 2007 16 commits
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.1-target-5.1.22 · 05d3b8d6
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22-merge
      
      
      05d3b8d6
    • unknown's avatar
      Bug #30389: connection_id() always return 0 in embedded server · 61e988e7
      unknown authored
        
      Initialize thd->variables.pseudo_thread_id when a new embedded
      thd is created.
      
      
      libmysqld/lib_sql.cc:
        Add comment regarding duplication of code in create_embedded_thd()
        vs. create_new_thread() and prepare_new_connection_state().  This
        was a cause for not properly initializing the pseudo_thread_id variable.
      mysql-test/r/func_misc.result:
        Add test case to ensure connection_id() returns a sane value
      mysql-test/t/func_misc.test:
        Add test case to ensure connection_id() returns a sane value
      sql/mysqld.cc:
        Add comment warning of the duplication of code between create_new_thread()
        and create_embedded_thd()
      sql/sql_connect.cc:
        Add comment warning of the duplication of code between
        prepare_new_connection_state() and create_embedded_thd()
      61e988e7
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 · ad4ee206
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X
      
      
      sql/ha_partition.cc:
        Auto merged
      ad4ee206
    • unknown's avatar
      Bug #30412 and Bug #30413 · 048775df
      unknown authored
      Update some tests in the "parts" suite, so they're skipped if the
      requisite plugins are not present in the mysqld.
      
      
      mysql-test/suite/parts/t/partition_char_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_datetime_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_decimal_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_float_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_int_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/partition_special_innodb.test:
        Skip if mysqld doesn't include InnoDB support
      mysql-test/suite/parts/t/rpl_partition.test:
        Skip if mysqld doesn't include partition support
      048775df
    • unknown's avatar
      Fixes for the following bugs: · bfed329e
      unknown authored
      Bug #30316: Some "parts" tests fail because the server uses "--secure-file-priv"
      Bug #30341: Test suite "parts" needs to be adapted to the new rules disallowing many functio
      Bug #30408: Suite "parts" needs bug numbers updated
      Bug #30411: Suite "parts" needs bug numbers updated: ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
      Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
      Bug #30581: partition_value tests use disallowed CAST() function
      
      Included are some general fixes to allow the "parts" test suite to be run
      successfully.  This includes disabling a few tests or parts of tests,
      cleaning up the test cases and their results, etc.  Basically, these tests
      have not been run for some time, and had suffered some bit rot.
      
      The bugs were fixed as a single changeset, because in some ways they depend
      on each other.  I couldn't be sure I'd updated all the error codes (for
      bugs 30408 and 30411) without also adapting to the new allowed functions
      rules (bug 30341), and vice versa.
      
      
      mysql-test/include/partition_layout.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc:
        Add ASCII(), ORD() and WEEKOFYEAR() as blocked functions (they depend
        too much on character set, etc.).
        
        Remove DATEDIFF() as a blocked function (it is implemented in terms
        of TO_DAYS() and the minus operator).
      mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc:
        Remove ASCII(), ORD() and WEEKOFYEAR(), which are not allowed functions.
        
        Remove uses of CAST() in partitioning functions - it is not allowed.
        
        Disable testing of FLOOR() and CEILING on non-integer fields, due to
        Bug 30577.
        
        Test MOD() with an integer field instead of floating point (it has a
        hybrid result type, like FLOOR() and CEILING(), but makes sense to use
        with an integer field).
        
        Add DATEDIFF() as an allowed function, because it is implemented in
        terms of TO_DAYS() and the minus operator.
      mysql-test/suite/parts/inc/partition_alter3.inc:
        Remove use of disallowed CAST() function in partitioning
      mysql-test/suite/parts/inc/partition_blocked_sql_funcs.inc:
        The blocked functions are actually blocked now, so expect errors.
        
        This is a result of the fix for bug 18198.
      mysql-test/suite/parts/inc/partition_date.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
      mysql-test/suite/parts/inc/partition_datetime.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
      mysql-test/suite/parts/inc/partition_decimal.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
        
        Disable testing of FLOOR() and CEILING(), due to Bug 30577.
      mysql-test/suite/parts/inc/partition_directory.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/partition_double.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
        
        Disable testing of FLOOR() and CEILING(), due to Bug 30577.
      mysql-test/suite/parts/inc/partition_enum.inc:
        Remove use of CAST(), which is disallowed.
        
        Remove test which relies on CAST().
      mysql-test/suite/parts/inc/partition_float.inc:
        Remove uses of CAST() in partitioning functions - it is not allowed.
        
        Disable testing of FLOOR() and CEILING(), due to Bug 30577.
      mysql-test/suite/parts/inc/partition_layout_check1.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/partition_layout_check2.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/partition_methods1.inc:
        Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
      mysql-test/suite/parts/inc/partition_set.inc:
        Remove test which relies on CAST(), which is disallowed.
      mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
        Fix Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
        
        Move data files into std_data/parts/*, so they can be used with LOAD
        DATA INFILE '../std_data_ln/parts/*' while --secure-file-priv is in
        force.
      mysql-test/suite/parts/inc/partition_syntax.inc:
        Remove use of CAST(), which is disallowed.
      mysql-test/suite/parts/inc/partition_time.inc:
        Remove use of CAST(), which is disallowed.
      mysql-test/suite/parts/inc/partition_timestamp.inc:
        Remove use of CAST(), which is disallowed.
      mysql-test/suite/parts/inc/partition_value.inc:
        Disable this entire test file, because it relies on using CAST() as
        a partitioning function, which is disallowed.  See Bug 30581,
        "partition_value tests use disallowed CAST() function".
      mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/part_supported_sql_func_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/part_supported_sql_func_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_alter3_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_alter3_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_basic_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_basic_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_datetime_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_datetime_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_decimal_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_decimal_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_float_myisam.result:
        Update test case results
      mysql-test/suite/parts/r/partition_syntax_innodb.result:
        Update test case results
      mysql-test/suite/parts/r/partition_syntax_myisam.result:
        Update test case results
      mysql-test/suite/parts/t/disabled.def:
        Mark several more tests as disabled: partition_value_myisam,
        partition_value_innodb, part_supported_sql_func_ndb,
        rpl_ndb_dd_partitions, and partition_float_innodb
      mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc
      mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_date.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc
      mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_float.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc
      mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_int.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc
      mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc
      mysql-test/suite/parts/inc/partition_alter_1.inc:
        Correct expected error codes, which changed due to bug 29245.
      mysql-test/suite/parts/inc/partition_check.inc:
        Correct expected error codes, which changed due to bug 29245.
      mysql-test/suite/parts/inc/partition_syntax_1.inc:
        Correct expected error codes, which changed due to bug 29245.
      bfed329e
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22 · 76cf8367
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22-merge
      
      
      76cf8367
    • unknown's avatar
      ndb - bug#30646 fsync on close only if file is open for write · d319e12a
      unknown authored
      
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
        AsyncFile: fsync on close only if file is open for write (for AIX)
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
        AsyncFile: fsync on close only if file is open for write (for AIX)
      d319e12a
    • unknown's avatar
      BUG#21842: There was an inconsistency in the use of table->record[0] and · cd7d837b
      unknown authored
      table->record[1] buffers inside Rows_log_event::find_row() function. 
      The patch fixes this.
      
      
      sql/log_event.cc:
        Use table->record[0] to read records from table and table->record[1] to
        store a copy of the original record for comparisons.
      cd7d837b
    • unknown's avatar
      Bug #30648: Partition handler may not initialize variable used w/ autoincrement · 41c849dd
      unknown authored
      A local variable may be used uninitialized in 
      ha_partition::get_auto_increment().  Initialize it properly.
      
      
      sql/ha_partition.cc:
        Initialize first_value_part in ha_partition::get_auto_increment() with *first_value before
        it's used in the underlying table handler.  Thanks to Antony for digging up this fix.
      41c849dd
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 · 66262046
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
      
      
      sql/field.cc:
        Auto merged
      66262046
    • unknown's avatar
      Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue · 2bf5b1aa
      unknown authored
      
      sql/field.cc:
        - always pack in little endian, irrespective of starage engine native format
        - always unpack as if it is atored in little endian, and unpack it to storage engine native format
      2bf5b1aa
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-target-5.1.22 · 75fe12a1
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/mysql-5.1-target-5.1.22-joro
      
      
      75fe12a1
    • unknown's avatar
      portation fixes for bug 29536 and 29325 in · 2ed51552
      unknown authored
      re-pushing for 5.1.22.
      
      
      mysql-test/suite/rpl/t/rpl_timezone.test:
        typo fixed in re-pushing bug 29536
      sql/mysqld.cc:
        portation fixes ->5.1 for bug 29325
      2ed51552
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 · 0e7c9704
      unknown authored
      into  trift2.:/MySQL/M51/target-5.1.22
      
      
      0e7c9704
    • unknown's avatar
      Merge trift2.:/MySQL/M51/netware3-5.1 · c749a21a
      unknown authored
      into  trift2.:/MySQL/M51/target-5.1.22
      
      
      configure.in:
        Auto merged
      c749a21a
    • unknown's avatar
      More cleanup / fixing for NetWare: · d7774462
      unknown authored
      1) "test_db.sql" is a plaintext file, no binary;
      2) do not try to strip the binaries, it will not work.
      
      
      configure.in:
        For NetWare, we cannot strip the binaries, so there is no use in attempting it.
      scripts/make_binary_distribution.sh:
        Get rid of a typing error, introduced when a following file name was deleted.
      d7774462