1. 14 Oct, 2005 11 commits
  2. 13 Oct, 2005 29 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
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · eb8be326
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      eb8be326
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 · 5eac62c7
      unknown authored
      
      support-files/mysql.spec.sh:
        Auto merged
      5eac62c7
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 · 507dc62a
      unknown authored
      
      support-files/mysql.spec.sh:
        Auto merged
      507dc62a
    • unknown's avatar
      - added a usermod call in the postinstall section of the RPM spec file · 124b0a59
      unknown authored
         to assign a potential existing mysql user to the correct user group (BUG#12823) 
      
      
      support-files/mysql.spec.sh:
         - added a usermod call to assign a potential existing mysql user to the
           correct user group (BUG#12823)
      124b0a59
    • unknown's avatar
      RPM spec file fixes: · 4b51051d
      unknown authored
       - added a usermod call to assign a potential existing mysql user to the
         correct user group (BUG#12823)
       - Save the perror binary built during Max build so it supports the NDB
         error codes (BUG#13740)
       - added a separate macro "mysqld_group" to be able to define the
         user group of the mysql user seperately, if desired.
      
      
      support-files/mysql.spec.sh:
         - added a usermod call to assign a potential existing mysql user to the
           correct user group (BUG#12823)
         - Save the perror binary built during Max build so it supports the NDB
           error codes (BUG#13740)
         - added a separate macro "mysqld_group" to be able to define the
           user group of the mysql user seperately, if desired.
      4b51051d
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.1 · 08d45918
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      mysql-test/t/select.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      vio/vio.c:
        Auto merged
      mysql-test/r/select.result:
        Merge and change table names a,b,c to t1,t2.t3
      08d45918
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 53eae4a0
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/item.cc:
        Auto merged
      53eae4a0
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · f6cb4922
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b9278
      
      
      mysql-test/t/cast.test:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-tis620.c:
        Auto merged
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      f6cb4922
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · dc1eb889
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b9278
      
      
      dc1eb889
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2ef0b326
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
      
      
      2ef0b326
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 039eb3e4
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      039eb3e4
    • unknown's avatar
      Fixes during review of new pushed code · 79538fb6
      unknown authored
      
      sql/handler.cc:
        Indentation fixes
      sql/item.cc:
        Remove not needed test of *ref (If ref is set it always points to a valid address)
      sql/table.cc:
        Indentation changes
        Moved buff_end directly after 'buff' assignment to make code more clear
      sql/unireg.cc:
        Indentation changes
      79538fb6
    • unknown's avatar
      Merged from 4.1. · 2a25659b
      unknown authored
      2a25659b
    • unknown's avatar
      select.result, mysqldump-max.result: · 6bf7a0f3
      unknown authored
        after merge fix.
      range.result:
        fixing result accordingly
        ,
      cast.result:
        after merge fix
      range.test:
        Avoid SELECT'ing of BINARY column not to output 0x00 bytes.
      
      
      mysql-test/t/range.test:
        Avoid SELECT'ing of BINARY column not to output 0x00 bytes.
      mysql-test/r/cast.result:
        after merge fix
      mysql-test/r/mysqldump-max.result:
        after merge fix.
      mysql-test/r/range.result:
        fixing result accordingly
        ,
      mysql-test/r/select.result:
        after merge fix.
      6bf7a0f3
    • unknown's avatar
      Fixes during review of new code · c8067ec8
      unknown authored
      
      sql/slave.cc:
        Moved mutex_unlock to handle 'err' case properly
      vio/vio.c:
        Made code clearer (fcntl_mode is always 0 here)
      c8067ec8
    • unknown's avatar
      Use 4.1 code · 0e9f9498
      unknown authored
      0e9f9498
    • unknown's avatar
      Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp · 1e140677
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
      
      
      configure.in:
        Auto merged
      include/config-win.h:
        Auto merged
      include/m_string.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      myisam/mi_search.c:
        Auto merged
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-tis620.c:
        Auto merged
      strings/xml.c:
        Auto merged
      vio/vio.c:
        Auto merged
      vio/viosocket.c:
        Auto merged
      mysql-test/r/select.result:
        Merged from 4.1.
      netware/BUILD/mwenv:
        Merged from 4.1.
      scripts/make_binary_distribution.sh:
        Merged from 4.1.
      sql/mysqld.cc:
        Merged from 4.1.
      sql/sql_show.cc:
        Merged from 4.1.
      strings/my_strtoll10.c:
        Merged from 4.1.
      1e140677
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 94d51833
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.clean
      
      
      94d51833
    • unknown's avatar
      merging · 3d332ea7
      unknown authored
      3d332ea7