1. 20 Oct, 2005 1 commit
    • unknown's avatar
      Fix Bug#14107 (IM test failures on QNX) · a5f2355c
      unknown authored
      (v.2 with post-review fixes)
      
      
      server-tools/instance-manager/instance.cc:
        On QNX one cannot use fork() in multithreaded environment. Therefore we should use QNX's spawn()
      a5f2355c
  2. 17 Oct, 2005 2 commits
  3. 16 Oct, 2005 5 commits
    • unknown's avatar
      mysql-test-run.pl: · cced6ea2
      unknown authored
        Added --skip-im option handling
        Don't terminate script if IM fails to create PID file
      mtr_cases.pl:
        Added --skip-im option handling
      mtr_process.pl:
        Kill left over 'mysqld' processes started by IM
      
      
      mysql-test/lib/mtr_process.pl:
        Kill left over 'mysqld' processes started by IM
      mysql-test/lib/mtr_cases.pl:
        Added --skip-im option handling
      mysql-test/mysql-test-run.pl:
        Added --skip-im option handling
        Don't terminate script if IM fails to create PID file
      cced6ea2
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · df46fd01
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      df46fd01
    • unknown's avatar
    • unknown's avatar
      mysql-test-run.pl: · 4c4c0f87
      unknown authored
        Put socket files into $opt_tmpdir, to avoid problems
        with platforms that can't handle long socket paths.
      
      
      mysql-test/mysql-test-run.pl:
        Put socket files into $opt_tmpdir, to avoid problems
        with platforms that can't handle long socket paths.
      4c4c0f87
    • unknown's avatar
      thread_registry.h, thread_registry.cc: · 3e68a46a
      unknown authored
        Add explicit Thread_info::Thread_info() and move both
        initializers out of class definition, to solve link
        problem on QNX
      Makefile.am:
        Preserve executable mode on scripts
      make_binary_distribution.sh:
        Copy *.imtest files
      
      
      scripts/make_binary_distribution.sh:
        Copy *.imtest files
      mysql-test/Makefile.am:
        Preserve executable mode on scripts
      server-tools/instance-manager/thread_registry.cc:
        Add explicit Thread_info::Thread_info() and move both
        initializers out of class definition, to solve link
        problem on QNX
      server-tools/instance-manager/thread_registry.h:
        Add explicit Thread_info::Thread_info() and move both
        initializers out of class definition, to solve link
        problem on QNX
      3e68a46a
  4. 15 Oct, 2005 1 commit
    • unknown's avatar
      mysql.sln: · 682e1af4
      unknown authored
        Missing yaSSL added to pro-gpl target
      
      
      VC++Files/mysql.sln:
        Missing yaSSL added to pro-gpl target
      682e1af4
  5. 14 Oct, 2005 21 commits
    • unknown's avatar
      mysql.spec.sh: · 8b6c4068
      unknown authored
        Give mode arguments the same way in all places
        Moved copy of mysqld.a to "standard" build, but
        disabled it as we don't do embedded yet in 5.0
      
      
      support-files/mysql.spec.sh:
        Give mode arguments the same way in all places
        Moved copy of mysqld.a to "standard" build, but
        disabled it as we don't do embedded yet in 5.0
      8b6c4068
    • unknown's avatar
      mysql.spec.sh: · 726170e8
      unknown authored
        For 5.x, always compile with --with-big-tables
        Copy the config.log file to location outside
        the build tree
      
      
      support-files/mysql.spec.sh:
        For 5.x, always compile with --with-big-tables
        Copy the config.log file to location outside
        the build tree
      726170e8
    • unknown's avatar
      mysql.spec.sh: · f242afb0
      unknown authored
        Removed unneeded/obsolte configure options
        Added archive engine to standard server
        Removed the embedded server from experimental server
        Changed suffix "-Max" => "-max"
        Changed comment string "Max" => "Experimental"
      
      
      support-files/mysql.spec.sh:
        Removed unneeded/obsolte configure options
        Added archive engine to standard server
        Removed the embedded server from experimental server
        Changed suffix "-Max" => "-max"
        Changed comment string "Max" => "Experimental"
      f242afb0
    • unknown's avatar
      Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values · 171bf938
      unknown authored
      instead of Field_longlong::store(double nr).
      
      
      171bf938
    • unknown's avatar
      Change the "Password" column type for the Perl suite running the tests. bug#14023 · 83afcc9c
      unknown authored
      
      mysql-test/lib/init_db.sql:
        Data type of the "Password" column has been changed in "mysql_create_system_tables",
        this must be reflected here (until they are united). bug#14023
      83afcc9c
    • unknown's avatar
      configure.in: · 91018ea6
      unknown authored
        - reverted NDB version number, too
      
      
      configure.in:
        - reverted NDB version number, too
      91018ea6
    • unknown's avatar
      - revert version number in configure.in to 5.0.15 · b395e11c
      unknown authored
      
      configure.in:
        - revert version number to 5.0.15
      b395e11c
    • unknown's avatar
      Merge mysql.com:/data0/mysqldev/my/mysql-5.0 · 40219cd1
      unknown authored
      into mysql.com:/data0/mysqldev/my/mysql-5.0-release
      
      
      40219cd1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 800061bd
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      800061bd
    • unknown's avatar
      Fixed compile errors on windows · 91afe31f
      unknown authored
      
      VC++Files/test1/mysql_thr.c:
        Fixed typo
      VC++Files/thr_test/thr_test.c:
        Fixed typo
      sql/log_event.cc:
        Removed compiler warning
        Fixed compile error on windows
      91afe31f
    • unknown's avatar
      ctype_utf8.result: · 92f80fbb
      unknown authored
        after merge fix
        ,
      
      
      mysql-test/r/ctype_utf8.result:
        after merge fix
        ,
      92f80fbb
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b13751 · df3e57f5
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.char1
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        after merge fix.
      sql/sql_update.cc:
        discarding this change in 5.0.
      df3e57f5
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9cc7d75e
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b13751
      
      
      9cc7d75e
    • unknown's avatar
      Had to revert change, because it breaks compilation for · 7ec96539
      unknown authored
      Netware. Hartmut informed about this.
      
      
      7ec96539
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · d184778e
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.char1
      
      
      d184778e
    • unknown's avatar
      Small fixes for Netware. · babdedd5
      unknown authored
      
      netware/mysql_test_run.c:
        Fixed typo.
      netware/pack_isam.def:
        Added screenname.
      scripts/make_binary_distribution.sh:
        Fixed mistake in merge.
      babdedd5
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1e11d278
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b13751
      
      
      1e11d278
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · 2aa10d24
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.char1
      
      
      2aa10d24
    • unknown's avatar
      Fix link failure on OS X · ee52c9d6
      unknown authored
      
      ndb/src/mgmsrv/Services.cpp:
        Remove explicit instantiation to fix link failure on OS X
      ee52c9d6
    • unknown's avatar
      .del-mysqlwatch.vcproj~91c7061bceb731ad: · 4303114e
      unknown authored
        Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj
      .del-mysqlshutdown.vcproj~b956e6769cf4fe76:
        Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj
      .del-pack_isam_ia64.dsp~6172aec32da6de5d:
        Delete: VC++Files/pack_isam/pack_isam_ia64.dsp
      .del-pack_isam.vcproj~82b3c430c0c623f2:
        Delete: VC++Files/pack_isam/pack_isam.vcproj
      .del-pack_isam.dsp~1f236852e0bcc13d:
        Delete: VC++Files/pack_isam/pack_isam.dsp
      .del-isamchk_ia64.dsp~abb473e7d3025305:
        Delete: VC++Files/isamchk/isamchk_ia64.dsp
      .del-isamchk.vcproj~19838e6a73320284:
        Delete: VC++Files/isamchk/isamchk.vcproj
      .del-isamchk.dsp~6349525f4cf767a4:
        Delete: VC++Files/isamchk/isamchk.dsp
      .del-isam_ia64.dsp~e6dffc47e113891:
        Delete: VC++Files/isam/isam_ia64.dsp
      .del-isam.vcproj~53282403e12348c3:
        Delete: VC++Files/isam/isam.vcproj
      .del-isam.dsw~c64a212cb134161a:
        Delete: VC++Files/isam/isam.dsw
      .del-isam.dsp~9c26247a621084bf:
        Delete: VC++Files/isam/isam.dsp
      mysql.sln:
        Removed isam from Visual Studio .Net project files, accidently merged over from 4.1
      
      
      VC++Files/mysql.sln:
        Removed isam from Visual Studio .Net project files, accidently merged over from 4.1
      BitKeeper/deleted/.del-isam.dsp~9c26247a621084bf:
        Delete: VC++Files/isam/isam.dsp
      BitKeeper/deleted/.del-isam.dsw~c64a212cb134161a:
        Delete: VC++Files/isam/isam.dsw
      BitKeeper/deleted/.del-isam.vcproj~53282403e12348c3:
        Delete: VC++Files/isam/isam.vcproj
      BitKeeper/deleted/.del-isam_ia64.dsp~e6dffc47e113891:
        Delete: VC++Files/isam/isam_ia64.dsp
      BitKeeper/deleted/.del-isamchk.dsp~6349525f4cf767a4:
        Delete: VC++Files/isamchk/isamchk.dsp
      BitKeeper/deleted/.del-isamchk.vcproj~19838e6a73320284:
        Delete: VC++Files/isamchk/isamchk.vcproj
      BitKeeper/deleted/.del-isamchk_ia64.dsp~abb473e7d3025305:
        Delete: VC++Files/isamchk/isamchk_ia64.dsp
      BitKeeper/deleted/.del-pack_isam.dsp~1f236852e0bcc13d:
        Delete: VC++Files/pack_isam/pack_isam.dsp
      BitKeeper/deleted/.del-pack_isam.vcproj~82b3c430c0c623f2:
        Delete: VC++Files/pack_isam/pack_isam.vcproj
      BitKeeper/deleted/.del-pack_isam_ia64.dsp~6172aec32da6de5d:
        Delete: VC++Files/pack_isam/pack_isam_ia64.dsp
      BitKeeper/deleted/.del-mysqlshutdown.vcproj~b956e6769cf4fe76:
        Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj
      BitKeeper/deleted/.del-mysqlwatch.vcproj~91c7061bceb731ad:
        Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj
      4303114e
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4083d456
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
      
      
      4083d456
  6. 13 Oct, 2005 10 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 5474a240
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      5474a240
    • unknown's avatar
      configure.in: · 178155bb
      unknown authored
        New version 5.0.16
      
      
      configure.in:
        New version 5.0.16
      178155bb
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 96e7df0c
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
      
      
      96e7df0c
    • unknown's avatar
      configure.in: · 4f204c52
      unknown authored
        rc => GA
      
      
      configure.in:
        rc => GA
      4f204c52
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · acb50e59
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      acb50e59
    • unknown's avatar
      Move handling of suffix_length from strnxfrm_bin() to filesort to ensure... · b896d334
      unknown authored
      Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
      field::sort_key() now adds length last for varbinary/blob
      VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
      Fixed issues in test cases from last merge
      
      
      
      mysql-test/r/select.result:
        Change column name in test to get GROUP BY to use the alias
      mysql-test/r/type_blob.result:
        Test BLOB and VARCHAR sorting
      mysql-test/t/select.test:
        Change column name in test to get GROUP BY to use the alias
        Drop used tables at start of test
        Don't use table names 'a', 'b' or 'c'
      mysql-test/t/type_blob.test:
        Test BLOB and VARCHAR sorting
      sql/field.cc:
        Store length last in VARBINARY() and BLOB() columns to get shorter strings sorted before longer onces
      sql/field.h:
        Added method 'sort_length()' to allow one to have length bytes last for VARBINARY/BLOB to get these to sort properly
      sql/filesort.cc:
        Use 'sort_length()' instead of 'pack_length()' to get length of field.
        Store suffix_length last for varbinary (blob) objects.
        The above ensures that BLOB/VARBINARY are correctly sorted (shorter strings before longer ones)
      sql/sql_class.h:
        Added sort suffix length (to get varbinary/blob to sort correctly)
      sql/sql_select.cc:
        Use sort_length() instead of pack_lengths()
      strings/ctype-bin.c:
        Don't let strnxfrm_bin store length last
        Better to do it in MySQL field object to ensure it's done properly for all cases
      b896d334
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 0dc3105a
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
      
      
      0dc3105a
    • unknown's avatar
      - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236) · 00695490
      unknown authored
      - fixed test
      
      
      mysql-test/r/rpl_multi_update2.result:
        fixed setting/reseting environment
        multi-update with subquery added
      mysql-test/t/rpl_multi_update2.test:
        fixed setting/reseting environment
        multi-update with subquery added
      sql/sql_update.cc:
        set 'updating' in both tables list if we have two of them (because of subquery)
      00695490
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 365472f6
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
      
      
      365472f6
    • unknown's avatar
      BUG# 13146 · b52b67eb
      unknown authored
      Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes 
      when dumping triggers
      
      
      client/mysqldump.c:
        BUG# 13146
        
        Re-application of fix to clean 5.0 tree. 
        
        Added comments for quote_name, moved declarations into proper order, 
        unset MASK_ANSI_QUOTES flag in opt_compatible_mode global when dumping
        triggers
      mysql-test/r/mysqldump.result:
        BUG# 13146
        
        New test results
      mysql-test/t/mysqldump.test:
        BUG# 13146
        
        New test
      b52b67eb