An error occurred fetching the project authors.
  1. 15 Jun, 2007 3 commits
    • unknown's avatar
      Additional fix for bug N26402: · a0091f64
      unknown authored
      An attempt to open file with name '????????.frm'
      can produce different errors:
      - ER_NO_SUCH_TABLE on Unix
      - ER_FILE_NOT_FOUND on Windows
      because QUESTION MARK has special meaning on Windows.
      Make sure that any of these two errors happens.
      
      
      mysql-test/r/show_check.result:
        Additional fix for bug N26402
      mysql-test/t/show_check.test:
        Additional fix for bug N26402
      a0091f64
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862 · 1805b34e
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28862
      
      
      mysql-test/r/csv.result:
        After merge fix
      mysql-test/t/csv.test:
        After merge fix
      storage/csv/ha_tina.cc:
        After merge fix
      1805b34e
    • unknown's avatar
      Bug#28862 Extended Latin1 characters get lost in CVS engine · 39700afd
      unknown authored
        Problem: Temporary buffer which is used for quoting and escaping
        was initialized to character set utf8, and thus didn't allow
        to store data in other character sets.
        Fix: changing character set of the buffer to be able to
        store any arbitrary sequence of bytes.
      
      
      mysql-test/r/csv.result:
        Adding test case
      mysql-test/t/csv.test:
        Adding test case
      sql/examples/ha_tina.cc:
        Changing character set of the buffer to "binary".
      39700afd
  2. 14 Jun, 2007 5 commits
    • unknown's avatar
      Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6 · f97b8c99
      unknown authored
      into  ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysys/mf_keycache.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      f97b8c99
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 837ba138
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
      
      
      837ba138
    • unknown's avatar
      Bug#26402 Server crashes with old-style named table · 805c446c
      unknown authored
        Problem: crash on attempt to open a table
        having "#mysql50#" prefix in db or table name.
        Fix: This prefix is reserved for "mysql_upgrade"
        to access 5.0 tables  whose file names are not encoded
        according to "5.1 tablename to filename encoded".
        Don't try open tables whose db name or table name
        has this prefix.
      
      
      mysql-test/r/show_check.result:
        Adding test case.
      mysql-test/t/show_check.test:
        Adding test case.
      sql/mysql_priv.h:
        Moving 5.0 prefix declarations into mysql_priv.h
      sql/sql_table.cc:
        Moving 5.0 prefix declarations into mysql_priv.h
      sql/table.cc:
        Don't try to do "normal" open of tables having '#mysql50#' prefix in
        db or table name. This prefix is reserved to access to unencoded
        table names when upgrading from 5.0 to 5.1.
      805c446c
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines · e1f5ce69
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
      
      
      mysql-test/r/merge.result:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      e1f5ce69
    • unknown's avatar
      BUG#26976 - Missing table in merge not noted in related error msg + · 5bc3eb2e
      unknown authored
                  SHOW CREATE TABLE fails
      Addition to the fix: report db name + table name instead of table path.
      This solves embedded merge test failure.
      
      
      mysql-test/r/merge.result:
        BUG#26976 - Missing table in merge not noted in related error msg +
                    SHOW CREATE TABLE fails
        Addition to the fix: report db name + table name instead of table path.
      sql/ha_myisammrg.cc:
        BUG#26976 - Missing table in merge not noted in related error msg +
                    SHOW CREATE TABLE fails
        Addition to the fix: report db name + table name instead of table path.
      5bc3eb2e
  3. 13 Jun, 2007 1 commit
    • unknown's avatar
      Bug#25800 · cc4cfb3a
      unknown authored
        "Embedded server requires mysql.plugin"
        Embedded builds should not print any error when the mysql.plugin
        table does not exist. This is achieved by checking for the existance
        of the mysql.plugin table before attempting to open it and proceed
        silently if it does not exist.
      
      
      sql/sql_plugin.cc:
        bug25800
          Embedded builds should not print any error when the mysql.plugin
          table does not exist. This is achieved by checking for the existance
          of the mysql.plugin table before attempting to open it and proceed
          silently if it does not exist.
      cc4cfb3a
  4. 08 Jun, 2007 1 commit
    • unknown's avatar
      BUG#26976 - Missing table in merge not noted in related error msg + · 5f26429d
      unknown authored
                  SHOW CREATE TABLE fails
      
      After merge fixes.
      
      
      mysql-test/r/backup.result:
        Fixed test result.
      mysql-test/r/sp.result:
        Fixed test result.
      sql/sql_table.cc:
        Fixed wrongly merged line. Moved "deprecated" warnings from sql_yacc.yy
        to mysql_backup_tables/mysql_restore_table.
      sql/sql_yacc.yy:
        Moved "deprecated" warnings from sql_yacc.yy to
        mysql_backup_tables/mysql_restore_table.
      storage/myisam/ha_myisam.cc:
        Do not report the same error twice.
      storage/myisammrg/ha_myisammrg.cc:
        Removed wrongly merged line.
      5f26429d
  5. 07 Jun, 2007 5 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 73016f8f
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~1:
        Auto merged
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      73016f8f
    • unknown's avatar
      Merge trift2.:/MySQL/M41/bug23504-4.1 · d37e1642
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      netware/my_print_defaults.def:
        Use 5.0 version
      d37e1642
    • unknown's avatar
      netware/*.def : Allocate 128K stack for all executables (bug#23504) · bc671e2f
      unknown authored
      netware/comp_err.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/isamchk.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/isamlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/libmysql.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/my_print_defaults.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisam_ftdump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisamchk.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisamlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisampack.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_install_db.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_test_run.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_waitpid.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqladmin.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlbinlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlcheck.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqld.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqld_safe.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqldump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlimport.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlshow.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqltest.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/pack_isam.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/perror.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/replace.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/resolve_stack_dump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/resolveip.def:
        Allocate 128K stack for all executables (bug#23504)
      bc671e2f
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines · 97a7a6d4
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
      
      
      mysql-test/r/key_cache.result:
        Auto merged
      mysql-test/r/lock.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/r/preload.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/repair.result:
        Auto merged
      mysql-test/r/rpl_failed_optimize.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      storage/myisammrg/myrg_def.h:
        Auto merged
      storage/myisammrg/myrg_open.c:
        Auto merged
      mysql-test/r/backup.result:
        Use local.
      mysql-test/r/sp.result:
        Use local.
      sql/sql_error.cc:
        Use local.
      sql/sql_error.h:
        Use local.
      sql/share/errmsg.txt:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      storage/myisam/ha_myisam.cc:
        Manual merge.
      storage/myisammrg/ha_myisammrg.cc:
        Manual merge.
      storage/myisammrg/ha_myisammrg.h:
        Manual merge.
      97a7a6d4
    • unknown's avatar
      Merge 81.176.158.240:devel/mysql/BUG26976/mysql-5.0-engines · 3ee66aa6
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      3ee66aa6
  6. 06 Jun, 2007 16 commits
  7. 05 Jun, 2007 9 commits
    • unknown's avatar
      BUG#26976 - Missing table in merge not noted in related error msg + · 55c76592
      unknown authored
                  SHOW CREATE TABLE fails
      
      Underlying table names, that merge engine fails to open were not
      reported.
      
      With this fix CHECK TABLE issued against merge table reports all
      underlying table names that it fails to open. Other statements
      are unaffected, that is underlying table names are not included
      into error message.
      
      This fix doesn't solve SHOW CREATE TABLE issue.
      
      
      myisammrg/myrg_def.h:
        Added myrg_print_wrong_table declaration.
      myisammrg/myrg_open.c:
        If HA_OPEN_FOR_REPAIR is passed to merge engine open function,
        report names of tables that we fail to open.
      mysql-test/r/backup.result:
        Updated test result.
      mysql-test/r/key_cache.result:
        Updated test result - removed duplicate error.
      mysql-test/r/lock.result:
        Updated test result - added summary row.
      mysql-test/r/merge.result:
        A test case for BUG#26976.
      mysql-test/r/preload.result:
        Updated test result - removed duplicate error, added summary row.
      mysql-test/r/ps.result:
        Updated test result - removed duplicate error, added summary row.
      mysql-test/r/repair.result:
        Updated test result - removed duplicate error, added summary row.
      mysql-test/r/rpl_failed_optimize.result:
        Updated test result - removed duplicate error, added summary row.
      mysql-test/r/sp.result:
        Updated test result - removed duplicate error, added summary row.
      mysql-test/r/view.result:
        Updated test result - removed duplicate error, added summary row.
      mysql-test/t/merge.test:
        A test case for BUG#26976.
      sql/ha_myisam.cc:
        Do not report same error twice.
      sql/ha_myisammrg.cc:
        If HA_OPEN_FOR_REPAIR is passed to merge engine open function,
        report names of tables that we fail to open.
        
        Added dummy ha_myisammrg::check to not confuse users with
        "not implemented" error in case all underlying tables are
        fine.
      sql/ha_myisammrg.h:
         Added ha_myisammrg::check declaration.
      sql/share/errmsg.txt:
        Added ER_ADMIN_WRONG_MRG_TABLE errno. It is used instead
        of ER_WRONG_MRG_TABLE in case HA_OPEN_FOR_REPAIR is
        passed to merge engine handler open function.
      sql/sql_error.cc:
        warning_level_* are now public. It is required by mysql_admin_table to
        report message level.
      sql/sql_error.h:
        warning_level_* are now public. It is required by mysql_admin_table to
        report message level.
      sql/sql_table.cc:
        Reorder mysql_admin_table arguments to meet it's definition.
        
        Report errors that are pending in thd->warn_list as results of
        admin function.
      55c76592
    • unknown's avatar
      ctype-bin.c: · 12ffd574
      unknown authored
        Post-merge fix warning
      
      
      strings/ctype-bin.c:
        Post-merge fix warning
      12ffd574
    • unknown's avatar
      sql_prepare.cc: · 4a6f4be2
      unknown authored
        Post-merge fix (byte -> uchar)
      
      
      sql/sql_prepare.cc:
        Post-merge fix (byte -> uchar)
      4a6f4be2
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · 38cf3b52
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      38cf3b52
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6d7cd0b2
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      6d7cd0b2
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · f5bc5381
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      f5bc5381
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · a31f2dde
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      a31f2dde
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 · bf70c5df
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
      
      
      bf70c5df
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · da338f3c
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      sql/mysqld.cc:
        Auto merged
      da338f3c