1. 13 Apr, 2005 1 commit
  2. 06 Apr, 2005 9 commits
    • unknown's avatar
      InnoDB: Avoid test suite failures caused by a locking conflict · cde615c9
      unknown authored
      between two server instances at server shutdown/startup.
      This conflict on advisory locks appears to be the result of a bug
      in the operating system; these locks should be released when the
      files are closed, but somehow that does not always happen
      immediately in Linux.  (Bug #9381)
      
      
      innobase/include/os0file.h:
        Add OS_FILE_OPEN_RETRY for os_file_create()ing ibdata1
      innobase/os/os0file.c:
        os_file_lock(): Do not close the file on failure, but let the
        callers do that.
        os_file_create(): If create_mode==OS_FILE_OPEN_RETRY and
        os_file_lock() fails, keep retrying for 100 seconds.
      innobase/srv/srv0start.c:
        open_or_create_data_files(): Open the first data file with
        OS_FILE_OPEN_RETRY, to resolve a conflict with a shutting-down
        instance of the MySQL server.
      cde615c9
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · d5b75475
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      d5b75475
    • unknown's avatar
      Makefile.am: · 12169860
      unknown authored
        Include the Perl version of mysql-test-run
      rpl_rewrite_db.test, rpl_rewrite_db.result:
        Added missing database cleanup
      mysql-test-run.pl:
        Embedded result files no longer needed
      
      
      mysql-test/mysql-test-run.pl:
        Embedded result files no longer needed
      mysql-test/r/rpl_rewrite_db.result:
        Added missing database cleanup
      mysql-test/t/rpl_rewrite_db.test:
        Added missing database cleanup
      mysql-test/Makefile.am:
        Include the Perl version of mysql-test-run
      12169860
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9c642e5b
      unknown authored
      into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
      
      
      9c642e5b
    • unknown's avatar
      Minor clean-ups for the previous commit. · 3683fc34
      unknown authored
      
      sql/field.cc:
        Use a separate variable. Otherwise "error" value gets lost
        after well_formed_length call.
      strings/ctype-mb.c:
        Don't return an error if we reached end of line.
      3683fc34
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · ddd9fd89
      unknown authored
      into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
      
      
      sql/sql_yacc.yy:
        Auto merged
      ddd9fd89
    • unknown's avatar
      Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables · 31d15c3f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      31d15c3f
    • unknown's avatar
      row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h: · 97b26d3b
      unknown authored
        Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
      
      
      innobase/include/btr0pcur.h:
        Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
      innobase/include/btr0pcur.ic:
        Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
      innobase/btr/btr0pcur.c:
        Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
      innobase/row/row0sel.c:
        Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
      97b26d3b
    • unknown's avatar
      Adding a new parameter for well_formed_length to · 5687fe36
      unknown authored
      return error. We'll use it for better warnign reporting.
      
      
      5687fe36
  3. 05 Apr, 2005 10 commits
  4. 04 Apr, 2005 6 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · a1112ca0
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      a1112ca0
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · e31062a2
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      sql/share/english/errmsg.txt:
        Auto merged
      e31062a2
    • unknown's avatar
      ha_innodb.cc: · a64487fc
      unknown authored
        Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
      
      
      sql/ha_innodb.cc:
        Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
      a64487fc
    • unknown's avatar
      ha_innodb.cc: · 9ce74a80
      unknown authored
        Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
      
      
      sql/ha_innodb.cc:
        Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
      9ce74a80
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 9176a1f4
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      9176a1f4
    • unknown's avatar
      ctype_uca.result: · 07182f5a
      unknown authored
        fixing test results accordingly.
      ctype-uca.c:
        It appeared that in traditional Spanish collation
        'RR' is not equal to 'R', as Unicode and Mimer state.
        We'll go Oracle and IBM way instead:
        No special rules to 'RR'.
      
      
      strings/ctype-uca.c:
        It appeared that in traditional Spanish collation
        'RR' is not equal to 'R', as Unicode and Mimer state.
        We'll go Oracle and IBM way instead:
        No special rules to 'RR'.
      mysql-test/r/ctype_uca.result:
        fixing test results accordingly.
      07182f5a
  5. 03 Apr, 2005 2 commits
  6. 02 Apr, 2005 7 commits
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · ecf8732c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      ecf8732c
    • unknown's avatar
      results updated · a77a2c83
      unknown authored
      a77a2c83
    • unknown's avatar
      merged · 5f8c654a
      unknown authored
      
      mysql-test/r/drop.result:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      5f8c654a
    • unknown's avatar
      bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names · 7d865e0b
      unknown authored
      sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)
      
      
      mysql-test/r/drop.result:
        bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
      mysql-test/t/drop.test:
        bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
      sql/share/english/errmsg.txt:
        allow longer "table names" as DROP TABLE puts a list here
      sql/share/russian/errmsg.txt:
        allow longer "table names" as DROP TABLE puts a list here
      sql/share/ukrainian/errmsg.txt:
        allow longer "table names" as DROP TABLE puts a list here
      sql/sql_table.cc:
        print an error with a function that respects width modifiers (%.64s)
      7d865e0b
    • unknown's avatar
      Clean up merge of fix for Bug #9468. · ee7f73d4
      unknown authored
      
      mysql-test/t/lowercase_table_grant.test:
        Disable test with embedded server
      mysql-test/t/skip_name_resolve.test:
        Disable test with embedded server
      sql/sql_parse.cc:
        Reset server status after a single statement in a multistatement
        query is handled in embedded server so it is not logged twice to
        the slow query log.
      ee7f73d4
    • unknown's avatar
      Merge embedded-server testing changes. · dd882cfb
      unknown authored
      
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/r/type_float.result:
        Auto merged
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/grant2.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      mysql-test/t/type_float.test:
        Auto merged
      mysql-test/t/user_var.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Merge changes
      mysql-test/t/ps_1general.test:
        Merge changes
      dd882cfb
    • unknown's avatar
      Fix handling of max_allowed_packet and net_buffer_length in · c7c3f5be
      unknown authored
      embedded server when a size suffix (K, M, G) is added. (Bug #9472)
      
      
      sql/mysqld.cc:
        Instead of (re)parsing max_allowed_packet and net_buffer_length
        for the embedded server, just set the global variables to what
        is set in global_system_variables within get_options().
      c7c3f5be
  7. 01 Apr, 2005 5 commits
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0ac7d26b
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      0ac7d26b
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · f1ae21bf
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      f1ae21bf
    • unknown's avatar
      Fix the new ps_grant test to clean itself up properly. · 3b82560b
      unknown authored
      
      mysql-test/r/ps_grant.result:
        Update results
      mysql-test/t/ps_grant.test:
        Fix cleanup of test
      3b82560b
    • unknown's avatar
      Merge changesets constituting 4.1.10a back into main tree, including release label. · b0b9d25a
      unknown authored
      
      include/my_global.h:
        Auto merged
      isam/create.c:
        Auto merged
      merge/mrg_create.c:
        Auto merged
      myisammrg/myrg_create.c:
        Auto merged
      mysys/mf_tempfile.c:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      configure.in:
        No change to main source when integrating 4.1.10a.
      myisam/mi_create.c:
        No change to main source when integrating 4.1.10a.
      scripts/mysql_create_system_tables.sh:
        No change to main source when integrating 4.1.10a.
      sql/mysql_priv.h:
        No change to main source when integrating 4.1.10a.
      sql/mysqld.cc:
        No change to main source when integrating 4.1.10a.
      sql/share/english/errmsg.txt:
        No change to main source when integrating 4.1.10a.
      b0b9d25a
    • unknown's avatar
      Last minor things to finish MySQL 4.1.10a: · 390fe9d9
      unknown authored
      - some wordings,
      - RPM packaging improvements.
      
      
      configure.in:
        Set the version string.
      scripts/mysql_create_system_tables.sh:
        Security change: Reduce the risk caused by predefined anonymous logins.
      sql/mysqld.cc:
        Correct a message text; align variable order with other versions.
      sql/sql_udf.cc:
        Fix an erroneous takeover of 4.0 wording.
      support-files/mysql.spec.sh:
        Fix date formatting, add missing change descriptions.
      390fe9d9