1. 13 Feb, 2008 2 commits
    • unknown's avatar
      Merge dator6.(none):/home/mikael/mysql_clones/bug32943 · 9166cae3
      unknown authored
      into  dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
      
      
      sql/sql_partition.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/partition_range.result:
        manual merge
      mysql-test/t/partition_range.test:
        manual merge
      9166cae3
    • unknown's avatar
      Added comments on why we do reopen · 455e9c1d
      unknown authored
      Handle error case of not being able to reopen which
      requires us to remove table from thread's open list
      and table_cache.
      
      455e9c1d
  2. 07 Feb, 2008 10 commits
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 85f028c6
      unknown authored
      into  dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
      
      85f028c6
    • unknown's avatar
      WL#3834: New build script for system admins and developers · 0f2486e4
      unknown authored
      especially for MySQL Cluster Carrier Grade Edition
      
      
      BUILD/build_mccge.sh:
        BitKeeper file /home/mikael/mysql_clones/mysql-5.1-engines/BUILD/build_mccge.sh
      BUILD/check-cpu:
        Added comments
        Added support for Core 2 cpu's
        Fixed some bad styles for scripts
        Fixed some copy-paste bug
        Added support for i386 from Mac OS X
        Added support for Itanium
        Added support for Sparc
        Added support for GCC 4.2+
        Fixed some issues with later change of cpu_arg
        Removed some broken, unnecessarily complex parts
        to find native compiler flags
      0f2486e4
    • unknown's avatar
      Bug#34225: suite/parts test failure · 666acb94
      unknown authored
      Pre push fix:
      added --sorted_result for consistent results
      
      
      mysql-test/suite/parts/inc/partition_bit.inc:
        Bug#34225: suite/parts test failure
        
        added --sorted_result for consistent results
      mysql-test/suite/parts/r/partition_bit_innodb.result:
        Bug#34225: suite/parts test failure
        
        added --sorted_result for consistent results
      mysql-test/suite/parts/r/partition_bit_myisam.result:
        Bug#34225: suite/parts test failure
        
        added --sorted_result for consistent results
      666acb94
    • unknown's avatar
      Merge dator6.(none):/home/mikael/mysql_clones/bug33429 · 85869879
      unknown authored
      into  dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
      
      85869879
    • unknown's avatar
      Merge dator6.(none):/home/mikael/mysql_clones/bug33182 · 3c52a205
      unknown authored
      into  dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
      
      
      mysql-test/r/partition.result:
        Auto merged
      mysql-test/t/partition.test:
        Auto merged
      3c52a205
    • unknown's avatar
      Merge witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-bug33379 · 0eaf5750
      unknown authored
      into  witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
      
      
      mysql-test/r/partition_datatype.result:
        Auto merged
      mysql-test/t/partition_datatype.test:
        Auto merged
      0eaf5750
    • unknown's avatar
      Merge witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-bug34225 · e1bb82bb
      unknown authored
      into  witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
      
      e1bb82bb
    • unknown's avatar
      Merge witty.ndb.mysql.com:/Users/mattiasj/Public/shared-vms/mysql-5.1-bug33379 · f51659f6
      unknown authored
      into  witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
      
      f51659f6
    • unknown's avatar
      Bug#34358: Cannot find specified bit row in partitioned table · 5a4274a7
      unknown authored
      Problem was incorrect data length in the key_restore function
      resulting in overwriting the search key.
      
      Solution, remove one byte in length if uneven bits are used.
      
      
      mysql-test/r/partition_datatype.result:
        Bug#34358: Cannot find specified bit row
        
        Updated result file
      mysql-test/t/partition_datatype.test:
        Bug#34358: Cannot find specified bit row
        
        Updated test file
        (corrected a few errors and added a test case for the bug)
      sql/key.cc:
        Bug34358: error in key_restore for bit fields with uneven bits
        
        When uneven bits exist, it has special treatment for the uneven bits
        but does use the same byte again when copying the rest of
        the key_part.
      5a4274a7
    • unknown's avatar
      Bug#33379: valgrind error in parts/partition_bit_myisam · 95470b7e
      unknown authored
      Problem was that Field_bit used Field::hash() function that did not
      know about using null-byte for storing bits.
      Resulting in wrong length, which was caught by valgrind.
      
      Solution: created a Field_bit::hash() that uses Field_bit::val_int()
      and my_charset_bin-collation function hash_sort.
      Also use the store function for platform independs
      
      
      mysql-test/r/partition_datatype.result:
        Bug#33379: valgrind error in parts/partition_bit_myisam
        
        result file
        
        enabled bit datatype test
      mysql-test/t/partition_datatype.test:
        Bug#33379: valgrind error in parts/partition_bit_myisam
        
        test file
        
        enabled bit datatype test
      sql/field.cc:
        Bug#33379: valgrind error in parts/partition_bit_myisam
        
        Problem was that Field_bit used Field::hash() function that did not
        know about using null-byte for storing bits.
        Resulting in wrong length.
        
        Solution: created a Field_bit::hash() that uses Field_bit::val_int()
        and my_charset_bin-collation function hash_sort.
        Also use the store function for platform independens.
      sql/field.h:
        Bug#33379: valgrind error in parts/partition_bit_myisam
        
        Problem was that Field_bit used Field::hash() function that did not
        know about using null-byte for storing bits.
        Resulting in wrong length.
        
        Solution: created a Field_bit::hash().
      95470b7e
  3. 06 Feb, 2008 1 commit
    • unknown's avatar
      Bug#34225: test suit parts uses /tmp-dir · 2dac9f68
      unknown authored
      Since it used /tmp-dir, it continues to fail on the same server
      until the /tmp-dir is cleaned. (Another problem was that it
      uses DATA/INDEX DIR without checking for symlink, which is needed)
      
      
      Solution:
      Moved all DATA/INDEX DIR test to a new partition_basic_symlink.inc file
      and use this for myisam and innodb, also requiring symlinks and
      not_windows.
      (i.e. removed DATA/INDEX DIR use from several tests)
      
      
      mysql-test/suite/parts/inc/partition_basic.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_bigint.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_binary.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_bit.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_blob.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_char.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_date.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_datetime.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_decimal.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_double.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_enum.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_float.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_int.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_key_16col.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_key_32col.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_key_4col.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_key_8col.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_mediumint.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_set.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_smallint.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_text.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_time.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_timestamp.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_tinyint.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_varbinary.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_varchar.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_year.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_basic_innodb.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_basic_myisam.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_bit_innodb.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_bit_myisam.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_char_innodb.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_char_myisam.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_datetime_innodb.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_datetime_myisam.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_decimal_innodb.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_decimal_myisam.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_float_innodb.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_float_myisam.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_int_innodb.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_int_myisam.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_special_innodb.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/r/partition_special_myisam.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/t/partition_sessions.test:
        Bug#34225: test suit parts uses /tmp-dir
        
        Removed the DATA/INDEX DIR, since the test is not dependent of it
        (adding "--source include/have_symlink.inc" would have disabled it
        on some platforms/configurations)
      mysql-test/suite/parts/inc/partition_basic_symlink.inc:
        Bug#34225: test suit parts uses /tmp-dir
        
        Added this test case for testing some DATA/INDEX DIRECTORY cases
        since I removed so much of it from all other tests.
      mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Added this test case for testing some DATA/INDEX DIRECTORY cases
        since I removed so much of it from all other tests.
      mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
        Bug#34225: test suit parts uses /tmp-dir
        
        Added this test case for testing some DATA/INDEX DIRECTORY cases
        since I removed so much of it from all other tests.
      mysql-test/suite/parts/t/partition_basic_symlink_innodb.test:
        Bug#34225: test suit parts uses /tmp-dir
        
        Added this test case for testing some DATA/INDEX DIRECTORY cases
        since I removed so much of it from all other tests.
      mysql-test/suite/parts/t/partition_basic_symlink_myisam.test:
        Bug#34225: test suit parts uses /tmp-dir
        
        Added this test case for testing some DATA/INDEX DIRECTORY cases
        since I removed so much of it from all other tests.
      2dac9f68
  4. 31 Jan, 2008 3 commits
  5. 30 Jan, 2008 1 commit
  6. 29 Jan, 2008 4 commits
  7. 28 Jan, 2008 3 commits
    • unknown's avatar
      BUG#33182: Disallow division due to div_precision_increment problems · c04a4e10
      unknown authored
      
      mysql-test/r/partition.result:
        New test case to validate that '/' is no longer allowed,
        only integer division is allowed
      mysql-test/t/partition.test:
        New test case to validate that '/' is no longer allowed,
        only integer division is allowed
      sql/item_func.h:
        +,-,*, mod is allowed
        / is disallowed
      c04a4e10
    • unknown's avatar
      BUG#33429: No check for maxvalue before adding partition · 6b282580
      unknown authored
      
      mysql-test/r/partition_range.result:
        Added new test cases
      mysql-test/t/partition_range.test:
        Added new test cases
      sql/sql_partition.cc:
        Added check that last partition hasn't got maxvalue defined when
        executing ADD PARTITION
      6b282580
    • unknown's avatar
      BUG#32943: Fixed buggy lock handling of ALTER TABLE for partitioning · 1317b7c5
      unknown authored
      
      mysql-test/r/partition_range.result:
        Added new test cases for lock tables and ALTER TABLE for
        partitions, also added a test case with a trigger.
      mysql-test/t/partition_range.test:
        Added new test cases for lock tables and ALTER TABLE for
        partitions, also added a test case with a trigger.
      sql/mysql_priv.h:
        Added WFRM_KEEP_SHARE for use of code not to be used otherwise
      sql/sql_partition.cc:
        Removed get_name_lock and release_name_lock, use
        close_data_files_and_morph_locks which leaves an
        exclusive name lock after completing.
        Reopen table after completing if under lock tables
        Updated comments
      sql/sql_table.cc:
        Ensure that code to set partition syntax isn't used other than
        when specifically asked to do it.
      1317b7c5
  8. 27 Jan, 2008 2 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 24cda918
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/r/mysqlcheck.result:
        Use local (manual merge)
      mysql-test/t/mysqlcheck.test:
        Use local (manual merge)
      24cda918
    • unknown's avatar
      Fix test case for Bug #25347 so that it actually tests the code fix, · 2989a539
      unknown authored
      and so that it works correctly on Windows.
      
      
      mysql-test/r/mysqlcheck.result:
        Flush tables before monkeying around with underlying MyISAM data files
      mysql-test/t/mysqlcheck.test:
        Fix the test case for bug #25347 so that it actually does test the behavior.
        Also, this makes it work on Windows by ensuring that mysqld doesn't hold the
        underlying MyISAM files open while we try to corrupt them on disk.
        
        Flush tables before monkeying around with underlying MyISAM data files;
        --use-frm, so that mysqlcheck will succeed.
      2989a539
  9. 26 Jan, 2008 4 commits
    • unknown's avatar
      Merge xiphis.org:/anubis/antony/work/bug33358.2 · cf58d6e5
      unknown authored
      into  xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1
      
      cf58d6e5
    • unknown's avatar
      fixes to make pushbuild tests green · c823ea57
      unknown authored
      
      mysql-test/t/plugin_load-master.opt:
        add '--loose' modifier to allow test to be skipped if plugin is not available.
      sql/sql_plugin.cc:
        Failure to load a plugin from command line option made non-fatal as plugin
        load failures from plugin table is already non-fatal.
      c823ea57
    • unknown's avatar
      Merge xiphis.org:/anubis/antony/work/bug33358.2 · 9c748e90
      unknown authored
      into  xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1
      
      9c748e90
    • unknown's avatar
      Bug#33358 · 802941e7
      unknown authored
        "Plugin enum variables can't be set from command line"
        fix crash of LOCK_plugins mutex when loading plug-ins from command line.
        fix off-by-one bug when loading multiple plug-ins from the command line.
        initialize command line handling for ENUM and SET plugin variable types.
      
      
      sql/sql_plugin.cc:
        Bug33358
          fix crash of LOCK_plugins mutex when loading plug-ins from command line.
          fix off-by-one bug when loading multiple plug-ins from the command line.
          initialize command line handling for ENUM and SET plugin variable types.
      mysql-test/r/plugin_load.result:
        New BitKeeper file ``mysql-test/r/plugin_load.result''
      mysql-test/t/plugin_load-master.opt:
        New BitKeeper file ``mysql-test/t/plugin_load-master.opt''
      mysql-test/t/plugin_load.test:
        New BitKeeper file ``mysql-test/t/plugin_load.test''
      802941e7
  10. 25 Jan, 2008 5 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 323ebccd
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/t/mysqlcheck.test:
        Manual merge
      323ebccd
    • unknown's avatar
      Un-break test case on Windows, for bug #25347 · f1669721
      unknown authored
      
      mysql-test/t/mysqlcheck.test:
        Use --remove_file and --write_file instead of --exec rm and --exec touch.
      f1669721
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 9c4292b9
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/sql_select.cc:
        Auto merged
      9c4292b9
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · e300d98b
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      client/mysqldump.c:
        Auto merged
      configure.in:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/handler.cc:
        Manual merge
      sql/item.cc:
        Manual merge
      e300d98b
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 93d6b918
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/sql_select.cc:
        Auto merged
      93d6b918
  11. 24 Jan, 2008 5 commits