1. 13 Oct, 2005 40 commits
    • 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 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 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
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · f4e6fca1
      unknown authored
      into  mysql.com:/home/my/mysql-4.0
      
      
      f4e6fca1
    • unknown's avatar
      Review of new pushed code · d853ecd6
      unknown authored
      - No need to check *ref when ref is checked (Simple optimization fix)
      
      
      sql/item.cc:
        No need to check *ref
      d853ecd6
    • unknown's avatar
      Bug #13461 Slave Cluster crashed on restart of two data nodes in seperate groups · 96d4b56c
      unknown authored
      - ensure in ndb_mgmd that the stop command is not issued if a node is restarting
      - added some new error messages
      - in ndbcntr on master check so that node does not shutdown id shutdoen in progress
      
      
      96d4b56c
    • unknown's avatar
      merging · 2a0183b5
      unknown authored
      
      sql/sql_select.cc:
        Auto merged
      2a0183b5
    • unknown's avatar
      Fix for bug #3874 (Group by field is not considered) · 2e887f79
      unknown authored
      
      mysql-test/r/select.result:
        test result fixed
      mysql-test/t/select.test:
        test case added
      sql/sql_select.cc:
        do the same for nullable
      2e887f79
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0d897747
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
      
      
      0d897747
    • unknown's avatar
      Some Netware related fixes and fixes for Metrowerks compiler. · cd04dcd7
      unknown authored
      
      netware/BUILD/mwenv:
        Removed -O3 for Metrowerks compiler.
      netware/pack_isam.def:
        NetWare specific change, Added SCRENNAME for pack_isam.
      scripts/make_binary_distribution.sh:
        Netware specific change for creating help tables.
      strings/my_strtoll10.c:
        Fix for Metrowerks compiler.
      cd04dcd7
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · 842fd992
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b9278
      
      
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      842fd992
    • unknown's avatar
      type_binary.result, type_binary.test: · 60e411eb
      unknown authored
        new file
      mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
        Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
      Many files:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
        Adding true BINARY/VARBINARY: new pad_char structure member.
      ctype-bin.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
        New strnxfrm, with two trailing length bytes.
      field.cc:
        Adding true BINARY/VARBINARY.
      
      
      sql/field.cc:
        Adding true BINARY/VARBINARY.
      strings/ctype-big5.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-bin.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
        New strnxfrm, with two trailing length bytes.
      strings/ctype-cp932.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-czech.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-euc_kr.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-eucjpms.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-extra.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-gb2312.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-gbk.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-latin1.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-simple.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-sjis.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-tis620.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-uca.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-ucs2.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-ujis.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-utf8.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      strings/ctype-win1250ch.c:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      include/m_ctype.h:
        Adding true BINARY/VARBINARY: new pad_char structure member.
      mysql-test/t/alter_table.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/binary.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/cast.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/ctype_cp1251.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/ctype_many.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/federated.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/func_in.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/ndb_condition_pushdown.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/ndb_types.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/sp.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/t/type_blob.test:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/alter_table.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/binary.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/cast.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/ctype_cp1251.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/ctype_many.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/federated.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/func_in.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/ndb_condition_pushdown.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/ndb_types.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/sp.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/system_mysql_db.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      mysql-test/r/type_blob.result:
        Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
      scripts/mysql_create_system_tables.sh:
        Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
      scripts/mysql_fix_privilege_tables.sql:
        Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
      60e411eb
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8b6ba46c
      unknown authored
      into moonbone.local:/work/13535-bug-4.1-mysql
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      8b6ba46c
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 99ed3437
      unknown authored
      into moonbone.local:/work/7672-bug-5.0-mysql
      
      
      99ed3437
    • unknown's avatar
      Merge · c7fa19ca
      unknown authored
      
      VC++Files/mysql.sln:
        Auto merged
      mysql-test/t/func_group.test:
        Auto merged
      c7fa19ca
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release · 341fbced
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      341fbced
    • unknown's avatar
      Manual merge of bug fix #7672 · 785b7dbc
      unknown authored
      
      sql/sql_lex.h:
        Auto merged
      785b7dbc
    • unknown's avatar
      A post-review fix (Bug#12736) · af43bd9d
      unknown authored
      af43bd9d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d1ffce69
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-12736
      
      
      d1ffce69
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp · 371f8c69
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/t/kill.test:
        Auto merged
      371f8c69
    • unknown's avatar
      Merge · 1bbf3a27
      unknown authored
      
      mysql-test/t/cast.test:
        Auto merged
      sql/item.h:
        Auto merged
      1bbf3a27
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp · d144a00d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      sql/item_strfunc.cc:
        Auto merged
      d144a00d