1. 26 Jan, 2006 16 commits
  2. 25 Jan, 2006 9 commits
  3. 24 Jan, 2006 15 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 732b14e2
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020
      
      
      sql/table.cc:
        Auto merged
      732b14e2
    • unknown's avatar
      fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE) · b17aa8f3
      unknown authored
      WL#1034 (Internal CRON)
      
      
      mysql-test/r/events.result:
        fix results file
      mysql-test/t/events.test:
        change test for the fix of bug#16404
      sql/lex.h:
        enabled/disabled were only for events, going back to enable/disable
        fix for bug#16404
      sql/sql_yacc.yy:
        ENABLED -> ENABLE
        DISABLED -> DISABLE
        fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
      b17aa8f3
    • unknown's avatar
      a1c93def
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e433aaeb
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-new
      
      e433aaeb
    • unknown's avatar
      Fix for crash of "mysql-test-run --debug mysqldump": don't access dir->str if dir is null. · 8dccc303
      unknown authored
      
      sql/parse_file.cc:
        since recently, the "dir" parameter can be 0.
      8dccc303
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 47f798b2
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
      
      47f798b2
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 33e0cc35
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs
      
      33e0cc35
    • unknown's avatar
      table.cc: · 758f23fd
      unknown authored
        Try to open an old 5.0 table name
        if encoded name doesn't exist.
        This makes SELECT working without having
        to rename tables with tricky characters
        in name into 5.1 format (simpliefies upgrade).
      
      
      sql/table.cc:
        Try to open an old 5.0 table name
        if encoded name doesn't exist.
        This makes SELECT working without having
        to rename tables with tricky characters
        in name into 5.1 format (simpliefies upgrade).
      758f23fd
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fe6754ef
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
      
      
      mysql-test/r/binlog_row_ctype_cp932.result:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      fe6754ef
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 04d71a69
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      04d71a69
    • unknown's avatar
      disabled.def: · 60a8641c
      unknown authored
        Updated to remove ndb_dd_disk2memory
      ndb_dd_disk2memory.result:
        Updated results to match change to show create table for NDB tables. WL 2604
      
      
      mysql-test/r/ndb_dd_disk2memory.result:
        Updated results to match change to show create table for NDB tables. WL 2604
      mysql-test/t/disabled.def:
        Updated to remove ndb_dd_disk2memory
      60a8641c
    • unknown's avatar
      bug#16742 - ndb dd - round filesize upwards · 06912007
      unknown authored
      
      storage/ndb/src/kernel/blocks/tsman.cpp:
        Round filesize upwards
      06912007
    • unknown's avatar
      bug#16738 - ndb dd - out of diskspace · 7d646e15
      unknown authored
        fix typo + add error code to printable list
      
      
      storage/ndb/include/kernel/signaldata/Extent.hpp:
        Set correct error code
      storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
        err is already negative
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Set correct error code
      storage/ndb/src/ndbapi/ndberror.c:
        Add error code to printable list
      7d646e15
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 22ee61de
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020
      
      
      sql/table.cc:
        Auto merged
      22ee61de
    • unknown's avatar
      bug #14354 - data directory and index directory not working for partitions · 89e741b5
      unknown authored
      
      mysql-test/r/partition_mgm_err.result:
        only the single drop table since we have disabled query logging for the create table
      mysql-test/t/partition_mgm_err.test:
        test for bug #14354
        first make sure /tmp/bug14354 is not there, then make the dir
        create a partitioned table with the partition using
        /tmp/bug14354 as it's data dir
        we are disabling query logging since we are using $MYSQL_TEST_DIR
        and we are not certain where the tmp files will be created.
      sql/ha_partition.cc:
        pass partition filename with pathname into 
        set_up_table_before_create.
        
        remove the path from the passed in value and then append the filename
        to the data_file_name or index_file_name if those values were
        specified.
      sql/ha_partition.h:
        added partition_name_with_path to set_up_table_before_create
      sql/mysql_priv.h:
        move append_file_to_dir to mysql_priv.h
      sql/sql_parse.cc:
        moving append_file_to_dir to mysql_priv.h
      sql/sql_partition.cc:
        add_keyword_string was not writing keyword value with quotes
      89e741b5