1. 29 Sep, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.0-4000 · 48838170
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      mysql-test/t/merge.test:
        Auto merged
      mysql-test/r/merge.result:
        SCCS merged
      48838170
    • unknown's avatar
      Bug#9112 - Merge table with composite index producing invalid results with some queries · a671075d
      unknown authored
      Second platform fix for floating point rounding.
      
      
      a671075d
    • unknown's avatar
      Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment · f3ad7320
      unknown authored
        "CHARACTER SET", "COLLATE", and "DEFAULT" are always
        printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
        "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
        if NO_FIELD_OPTIONS is not set.
      
      
      mysql-test/r/sql_mode.result:
        Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
          test case
      mysql-test/t/sql_mode.test:
        Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
          test case
      f3ad7320
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 25a4a395
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      25a4a395
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 66aef256
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      66aef256
    • unknown's avatar
      Many files: · 72340d67
      unknown authored
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      my_regex.h:
        Rename: regex/regex.h -> regex/my_regex.h
      
      
      client/mysqltest.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      os2/MySQL-Source.icc:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/Makefile.am:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/debug.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/debug.ih:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/engine.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/engine.ih:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/main.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/main.ih:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regcomp.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regerror.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regerror.ih:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/my_regex.h:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regexec.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/regfree.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      regex/reginit.c:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      sql/item_cmpfunc.cc:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      sql/item_cmpfunc.h:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      sql/mysqld.cc:
        Prefix regex functions/types with "my_" as our
        library is not compatible with normal regex lib.
      72340d67
  2. 28 Sep, 2005 12 commits
  3. 27 Sep, 2005 7 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0559f1e0
      unknown authored
      into moonbone.local:/work/13356-bug-4.1-mysql
      
      
      0559f1e0
    • unknown's avatar
      Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items. · a17b3dcb
      unknown authored
      resolve_const_item() assumed to be not called for Item_row items. For
      ensuring that DBUG_ASSERT(0) was set there.
      
      This patch adds section for Item_row items. If it can it recursively calls
      resolve_const_item() for each item the Item_row contains. If any of the
      contained items is null then whole Item_row substitued by Item_null. Otherwise
      it just returns.
      
      
      sql/item.cc:
        Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
        
        Added section to resolve_const_item() for Item_row items. If it can it
        recursively calls resolve_const_item() for each item the Item_row contains. If
        any of the contained items is null then Item_row is substituted by Item_null.
        Otherwise it just returns.
        Comment moved closer to function it belongs to.
      mysql-test/t/select.test:
        Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
      mysql-test/r/select.result:
        Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
      a17b3dcb
    • unknown's avatar
      Fix for bug #13501 "build problem: too many arguments to function my_bool · 06313b18
      unknown authored
      acl_init".
      
      Updated calls to acl_init()/grant_init() in init_embedded_server() - their
      signatures were changed recently, now they don't need argument for passing
      pointer to THD object (this code was only compiled if one built embedded
      server library with --with-embedded-privilege-control switch).
      
      
      libmysqld/lib_sql.cc:
        acl_init/grant_init() are now used only at server start up so they always
        allocate temporary THD object and don't need argument for passing pointer
        to it.
      06313b18
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · e4fe90bf
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
      
      
      client/mysqltest.c:
        Manual merge
      mysql-test/mysql-test-run.pl:
        patch alredy commited
      e4fe90bf
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.0-4000 · e4074a67
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      mysql-test/r/merge.result:
        Bug#9112 - Merge table with composite index producing invalid results with some queries
        Manual merge
      mysql-test/t/merge.test:
        Bug#9112 - Merge table with composite index producing invalid results with some queries
        Manual merge
      e4074a67
    • unknown's avatar
      Bug#9112 - Merge table with composite index producing invalid results with some queries · 629697e5
      unknown authored
      Reduced the precision of the test numbers.
      Not all platforms could reproduce the exact numbers.
      
      
      mysql-test/r/merge.result:
        Bug#9112 - Merge table with composite index producing invalid results with some queries
        The new test result
      629697e5
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · b97acc5d
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      b97acc5d
  4. 26 Sep, 2005 6 commits
  5. 25 Sep, 2005 2 commits
    • unknown's avatar
      Fixed error found during review of new pushed code · 466b46a6
      unknown authored
      
      client/mysql.cc:
        Don't use c_ptr() for cgets() and ensure buffer is not overwritten
      mysql-test/r/cast.result:
        More test for CAST(0x.... as signed)
      sql/opt_sum.cc:
        Fix bugs found during review
        - Changed code to be able to remove one if
        - Ensure that count == 0 only if is_exact_count == TRUE
      sql/sql_delete.cc:
        Ensure 'allow_sum_func' is reset before call to setup_conds
      sql/sql_lex.cc:
        allow_sum_func doesn't have to be reset for each query
        (It's to be reset in setup_fields() or before call to setup_conds()
      sql/sql_load.cc:
        Move set of auto_increment_field_not_null so that it's not set if field value is NULL
      sql/sql_prepare.cc:
        allow_sum_func doesn't have to be reset for each query
        (It's to be reset in setup_fields() or before call to setup_conds()
      sql/sql_update.cc:
        Ensure 'allow_sum_func' is reset before call to setup_conds
      466b46a6
    • unknown's avatar
      disabled.def: · 5aecf16a
      unknown authored
        Disable unstable test cases
        new file
      
      
      mysql-test/t/disabled.def:
        Disable unstable test cases
      5aecf16a
  6. 24 Sep, 2005 3 commits
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · b917ba13
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      b917ba13
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · b337566b
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      b337566b
    • unknown's avatar
      Makefile.am: · 3614cff7
      unknown authored
        Revert to shell test script for test targets
      mysqltest.c:
        Windows pclose() returns error code in low byte
      mysql_config.sh:
        Remove -Xa -xstrconst from --cflags for Sun C++
      
      
      scripts/mysql_config.sh:
        Remove -Xa -xstrconst from --cflags for Sun C++
      client/mysqltest.c:
        Windows pclose() returns error code in low byte
      Makefile.am:
        Revert to shell test script for test targets
      3614cff7
  7. 23 Sep, 2005 4 commits