1. 06 Feb, 2008 1 commit
    • unknown's avatar
      Bug#34225: test suit parts uses /tmp-dir · 2bac240c
      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.
      2bac240c
  2. 31 Jan, 2008 3 commits
  3. 30 Jan, 2008 1 commit
  4. 29 Jan, 2008 4 commits
  5. 27 Jan, 2008 2 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 4bacd537
      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)
      4bacd537
    • unknown's avatar
      Fix test case for Bug #25347 so that it actually tests the code fix, · 32f59206
      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.
      32f59206
  6. 26 Jan, 2008 4 commits
    • unknown's avatar
      Merge xiphis.org:/anubis/antony/work/bug33358.2 · b2d65369
      unknown authored
      into  xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1
      
      
      b2d65369
    • unknown's avatar
      fixes to make pushbuild tests green · 70884e09
      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.
      70884e09
    • unknown's avatar
      Merge xiphis.org:/anubis/antony/work/bug33358.2 · f9064eb0
      unknown authored
      into  xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1
      
      
      f9064eb0
    • unknown's avatar
      Bug#33358 · f1042103
      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''
      f1042103
  7. 25 Jan, 2008 5 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 8b314591
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/t/mysqlcheck.test:
        Manual merge
      8b314591
    • unknown's avatar
      Un-break test case on Windows, for bug #25347 · 9dbd3877
      unknown authored
      
      mysql-test/t/mysqlcheck.test:
        Use --remove_file and --write_file instead of --exec rm and --exec touch.
      9dbd3877
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · aa4f8572
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/sql_select.cc:
        Auto merged
      aa4f8572
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · bf541d14
      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
      bf541d14
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 893d98fb
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/sql_select.cc:
        Auto merged
      893d98fb
  8. 24 Jan, 2008 10 commits
  9. 23 Jan, 2008 10 commits
    • unknown's avatar
      Manual merge · e63a0501
      unknown authored
      e63a0501
    • unknown's avatar
      Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618 · 9d96bb98
      unknown authored
      into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-33618
      
      
      mysql-test/r/sp-code.result:
        Auto merged
      mysql-test/t/sp-code.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sp_rcontext.cc:
        Auto merged
      9d96bb98
    • unknown's avatar
      manual merge · 8430df5a
      unknown authored
      8430df5a
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · e7b65baa
      unknown authored
      into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618
      
      
      mysql-test/t/sp.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      e7b65baa
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 0a183226
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      0a183226
    • unknown's avatar
      Bug#33618 (Crash in sp_rcontext) · e6a077e3
      unknown authored
      Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
      
      The server used to crash when REPEAT or another control instruction
      was used in conjunction with labels and a LEAVE instruction.
      
      The crash was caused by a missing "pop" of handlers or cursors in the
      code representing the stored program. When executing the code in a loop,
      this missing "pop" would result in a stack overflow, corrupting memory.
      
      Code generation has been fixed to produce the missing h_pop/c_pop
      instructions.
      
      Also, the logic checking that labels at the beginning and the end of a
      statement are matched was incorrect, causing Bug 33983.
      End labels, when used, must match the label used at the beginning of a block.
      
      
      mysql-test/r/sp-code.result:
        Bug#33618 (Crash in sp_rcontext)
      mysql-test/r/sp-error.result:
        Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
      mysql-test/r/sp.result:
        Bug#33618 (Crash in sp_rcontext)
      mysql-test/t/sp-code.test:
        Bug#33618 (Crash in sp_rcontext)
      mysql-test/t/sp-error.test:
        Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
      mysql-test/t/sp.test:
        Bug#33618 (Crash in sp_rcontext)
      sql/sp_head.cc:
        Bug#33618 (Crash in sp_rcontext)
      sql/sp_head.h:
        Bug#33618 (Crash in sp_rcontext)
      sql/sp_rcontext.cc:
        Bug#33618 (Crash in sp_rcontext)
      sql/sp_rcontext.h:
        Bug#33618 (Crash in sp_rcontext)
      sql/sql_yacc.yy:
        Bug#33618 (Crash in sp_rcontext)
      e6a077e3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 450cd35b
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
      
      
      configure.in:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      450cd35b
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a12869df
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a12869df
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 63a454d4
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
      
      
      configure.in:
        Auto merged
      extra/resolveip.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/func_misc.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/myisam/ft_boolean_search.c:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      client/mysqlcheck.c:
        manual merge
      mysql-test/r/mysqlcheck.result:
        manual merge
      mysql-test/t/mysqlcheck.test:
        manual merge
      63a454d4
    • unknown's avatar
      Patch contributed by Jocelyn Fournier. CLA received 2007-02-27. · 616fd557
      unknown authored
      Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed
      
      mysqlcheck tests nullness of the engine type to know whether the
      "table" is a view or not.  That also falsely catches tables that 
      are severly damaged.
      
      Instead, use SHOW FULL TABLES to test whether a "table" is a view
      or not.
      
      (Don't add new function.  Instead, get original data a smarter way.)
      
      Make it safe for use against databases before when views appeared.
      
      
      client/mysqlcheck.c:
        Use SHOW FULL TABLES to test better whether a name in the table
        list is one of a view.  Checking that the engine is NULL is 
        insufficient.
        
        Implemented suggestion from jimw that involved removing most of 
        original patch and getting data a better way
      mysql-test/r/mysqlcheck.result:
        Verify that tables that have NULL/unreadable engine types are 
        processed and not interpreted as views.
      mysql-test/t/mysqlcheck.test:
        Verify that tables that have NULL/unreadable engine types are 
        processed and not interpreted as views.
      616fd557