1. 30 Sep, 2005 3 commits
    • unknown's avatar
      Many files: · b446550e
      unknown authored
        New VC7 project files
      des_key_file.cc:
        Visual C++ wants '"' for local include
      mysql.cc:
        Cast my_cgets() argument for VC6 and VC7
      dummy.cpp:
        Added to convince VS .Net generate a lib for mysqlserver
      
      
      VC++Files/mysqlserver/dummy.cpp:
        Added to convince VS .Net generate a lib for mysqlserver
      VC++Files/bdb/bdb.vcproj:
        New VC7 project files
      VC++Files/client/mysql.vcproj:
        New VC7 project files
      VC++Files/client/mysqladmin.vcproj:
        New VC7 project files
      VC++Files/client/mysqlclient.vcproj:
        New VC7 project files
      VC++Files/client/mysqldump.vcproj:
        New VC7 project files
      VC++Files/client/mysqlimport.vcproj:
        New VC7 project files
      VC++Files/client/mysqlshow.vcproj:
        New VC7 project files
      VC++Files/client/mysqltest.vcproj:
        New VC7 project files
      VC++Files/comp_err/comp_err.vcproj:
        New VC7 project files
      VC++Files/dbug/dbug.vcproj:
        New VC7 project files
      VC++Files/heap/heap.vcproj:
        New VC7 project files
      VC++Files/innobase/innobase.vcproj:
        New VC7 project files
      VC++Files/libmysql/libmysql.vcproj:
        New VC7 project files
      VC++Files/libmysqld/examples/test_libmysqld.vcproj:
        New VC7 project files
      VC++Files/libmysqld/libmysqld.vcproj:
        New VC7 project files
      VC++Files/libmysqltest/myTest.vcproj:
        New VC7 project files
      VC++Files/my_print_defaults/my_print_defaults.vcproj:
        New VC7 project files
      VC++Files/myisam/myisam.vcproj:
        New VC7 project files
      VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
        New VC7 project files
      VC++Files/myisamchk/myisamchk.vcproj:
        New VC7 project files
      VC++Files/myisamlog/myisamlog.vcproj:
        New VC7 project files
      VC++Files/myisammrg/myisammrg.vcproj:
        New VC7 project files
      VC++Files/myisampack/myisampack.vcproj:
        New VC7 project files
      VC++Files/mysql-test/mysql_test_run_new.vcproj:
        New VC7 project files
      VC++Files/mysql.sln:
        New VC7 project files
      VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
        New VC7 project files
      VC++Files/mysqlcheck/mysqlcheck.vcproj:
        New VC7 project files
      VC++Files/mysqldemb/mysqldemb.vcproj:
        New VC7 project files
      VC++Files/mysqlserver/mysqlserver.vcproj:
        New VC7 project files
      VC++Files/mysys/mysys.vcproj:
        New VC7 project files
      VC++Files/perror/perror.vcproj:
        New VC7 project files
      VC++Files/regex/regex.vcproj:
        New VC7 project files
      VC++Files/replace/replace.vcproj:
        New VC7 project files
      VC++Files/sql/mysqld.vcproj:
        New VC7 project files
      VC++Files/strings/strings.vcproj:
        New VC7 project files
      VC++Files/test1/test1.vcproj:
        New VC7 project files
      VC++Files/tests/mysql_client_test.vcproj:
        New VC7 project files
      VC++Files/thr_test/thr_test.vcproj:
        New VC7 project files
      VC++Files/vio/vio.vcproj:
        New VC7 project files
      VC++Files/zlib/zlib.vcproj:
        New VC7 project files
      client/mysql.cc:
        Cast my_cgets() argument for VC6 and VC7
      sql/des_key_file.cc:
        Visual C++ wants '"' for local include
      scripts/make_win_src_distribution.sh:
        New VC7 project files
      b446550e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · caa441d0
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      caa441d0
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · b96e4b68
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      b96e4b68
  2. 29 Sep, 2005 14 commits
    • unknown's avatar
      mtr_report.pl: · 3dd066e8
      unknown authored
        Text formatting, adjust table header
      mysql-test-run.pl:
        Remove requirement for source tree to run embedded server test
      mysqldump.test:
        Removed ending ';' from --exec line
      
      
      mysql-test/t/mysqldump.test:
        Removed ending ';' from --exec line
      mysql-test/mysql-test-run.pl:
        Remove requirement for source tree to run embedded server test
      mysql-test/lib/mtr_report.pl:
        Text formatting, adjust table header
      3dd066e8
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 7b8a6e45
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      7b8a6e45
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 · 7af7e616
      unknown authored
      
      support-files/mysql.spec.sh:
        Auto merged
      7af7e616
    • unknown's avatar
      - fixed the removing of the RPM_BUILD_ROOT in the %clean section of the RPM · a44907e7
      unknown authored
         spec file (the $RBR variable did not get expanded, thus leaving old build
         roots behind)
      
      
      support-files/mysql.spec.sh:
         - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
           $RBR variable did not get expanded, thus leaving old build roots behind)
      a44907e7
    • 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
      Add -ansi flag when building with gcc · 9a8482f6
      unknown authored
      
      BUILD/SETUP.sh:
        Add -ansi flag, make gcc not allow "C++ comments in C"
      9a8482f6
    • 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 mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd · 80b98425
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      80b98425
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/wl2779 · cf7d6534
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      cf7d6534
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · e77095bc
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd
      
      
      e77095bc
    • 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
  3. 28 Sep, 2005 12 commits
  4. 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
  5. 26 Sep, 2005 4 commits