1. 07 Jun, 2005 11 commits
    • unknown's avatar
      Merge b6883-mysql-4.1 -> 5.0 · c3c19993
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      myisam/mi_key.c:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/r/innodb.result:
        Manual merge
      sql/sql_parse.cc:
        Manual merge
      c3c19993
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1 · 6dc86a20
      unknown authored
      into mysql.com:/home/bk/b6883-mysql-4.1
      
      
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      6dc86a20
    • unknown's avatar
      BUG#6883: Changed comment, style · f337dd79
      unknown authored
      
      sql/sql_parse.cc:
        Changed comment, style
      f337dd79
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 · 6356c580
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-4.1
      
      
      6356c580
    • unknown's avatar
      Accepted openlogging · 295a5542
      unknown authored
      295a5542
    • unknown's avatar
      Bug#10253: compound index length and utf8 char set · c9914ac6
      unknown authored
      produces invalid query results
      
      mi_key.c:
        well_formed_length should be executed before space trimming, not after.
      ctype_utf8.test:
      ctype_utf8.result:
        adding test.
      
      
      myisam/mi_key.c:
        Bug#10253: ompound index length and utf8 char set produces invalid query results
        well_formed_length should be executed before space trimming, not after.
      mysql-test/r/ctype_utf8.result:
        adding test.
        adding test.
      mysql-test/t/ctype_utf8.test:
        adding test.
      c9914ac6
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7a6c62a1
      unknown authored
      into mysql.com:/home/gluh/MySQL/Bugs/5.0.10964
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      7a6c62a1
    • unknown's avatar
      merge · 6f1db965
      unknown authored
      6f1db965
    • unknown's avatar
      After merge fixes · e90b64cd
      unknown authored
      
      mysql-test/r/innodb.result:
        Update results
      mysql-test/r/warnings.result:
        Update results
      sql/item.cc:
        Simple optimization
      sql/item_func.cc:
        After merge fix
      sql/item_sum.cc:
        Fixes for group_concat and rollup (From Ramil)
      sql/sql_parse.cc:
        Remove compiler warning
      sql/sql_select.cc:
        Fixed problem with rollup
      e90b64cd
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · e3dc3db6
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      e3dc3db6
    • unknown's avatar
      BUG#7967 Fix mysqlhotcopy --record-log-position · d09d8156
      unknown authored
      
      BitKeeper/etc/ignore:
        Added scripts/mysqlhotcopy.sh.rej to the ignore list
      scripts/mysqlhotcopy.sh:
        BUG#7967 Use fetchrow_hashref() when parsing SHOW SLAVE STATUS so
        that --record-log-pos option will work with all versions from 3.23
        forward and will not break again in the future if additional columns
        are added.
      d09d8156
  2. 06 Jun, 2005 29 commits
    • unknown's avatar
      Merge with 4.1 · bd47a7df
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      client/sql_string.cc:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/warnings.test:
        Auto merged
      mysys/raid.cc:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/field.cc:
        Auto merged
      BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
        Auto merged
      BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_blackhole.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_geofunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_uniq.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/procedure.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol_cursor.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_analyse.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_error.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_map.cc:
        Auto merged
      sql/sql_olap.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/examples/ha_archive.cc:
        Auto merged
      sql/examples/ha_example.cc:
        Auto merged
      sql/examples/ha_tina.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/tztime.cc:
        Auto merged
      strings/ctype-win1250ch.c:
        Auto merged
      mysql-test/r/func_gconcat.result:
        merge & ensure that 4.1 and 5.0 source have tests in same order
      mysql-test/r/innodb.result:
        merge & ensure that 4.1 and 5.0 source have tests in same order
      mysql-test/t/func_gconcat.test:
        merge & ensure that 4.1 and 5.0 source have tests in same order
      mysql-test/t/innodb.test:
        merge & ensure that 4.1 and 5.0 source have tests in same order
      sql/item_func.cc:
        merge
      sql/mysqld.cc:
        merge
      sql/opt_range.cc:
        merge
      sql/sql_parse.cc:
        merge
        Give better name to goto labels
      sql/sql_select.cc:
        merge
      bd47a7df
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f21e2364
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      f21e2364
    • unknown's avatar
      Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE · 9595c788
      unknown authored
      This fixes bug #11080: Multi-row REPLACE fails on a duplicate key error
      
      
      mysql-test/r/auto_increment.result:
        New tests for auto-increment and replace
      mysql-test/r/innodb.result:
        New tests for auto-increment and replace
      mysql-test/t/auto_increment.test:
        New tests for auto-increment and replace
      mysql-test/t/innodb.test:
        New tests for auto-increment and replace
      mysys/my_alloc.c:
        More comments
      9595c788
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · b775f986
      unknown authored
      into monster.:D:/Work/mysql5.0
      
      
      b775f986
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a0682cac
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a0682cac
    • unknown's avatar
      fixes for compiler warnings from VC6 · 6e82d648
      unknown authored
      
      client/mysqltest.c:
        undef popen prior to redefining it to avoid compiler warning
        cast len argument to replace_dynstr_append_mem to int.  This should be ok because the 
        replace_dynstr_append method uses strlen to accomplish the same thing.
      myisam/mi_create.c:
        cast myisam_block_size down to uint16 to match the struct element block_length
      mysys/default.c:
        add (char*) cast to make compiler happy
      mysys/my_handler.c:
        add (my_bool) cast to make compiler happy
      6e82d648
    • unknown's avatar
      ctype_cp1250_ch.result, ctype_cp1250_ch.test: · 936b9319
      unknown authored
        Adding test.
      ctype-win1250ch.c:
        Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
        Wrong min_sort_char fix.
      
      
      strings/ctype-win1250ch.c:
        Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
        Wrong min_sort_char fix.
      mysql-test/t/ctype_cp1250_ch.test:
        Adding test.
      mysql-test/r/ctype_cp1250_ch.result:
        Adding test.
      936b9319
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4fb0b9b8
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      4fb0b9b8
    • unknown's avatar
      A logger patch for Netware. · 3358d782
      unknown authored
      3358d782
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 32fc1737
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      32fc1737
    • unknown's avatar
      A fix for Metrowerks compiler. · a1122ab0
      unknown authored
      
      netware/BUILD/mwenv:
        A fix for Metrowerks compiler, compiler option to change enum size
        from 2 bytes to 4 bytes.
      a1122ab0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6fd6ad91
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      6fd6ad91
    • unknown's avatar
      Some fixes for Netware. · e515cd1b
      unknown authored
      
      include/my_sys.h:
        Metrowerks compiler has _alloca() nowadays.
        Netware does not have mmap()
      netware/mysql_test_run.c:
        A fix for netware mysql_test_run client.
      e515cd1b
    • unknown's avatar
      Some fixes for Netware builds. · 9d5e2e91
      unknown authored
      
      
      netware/BUILD/compile-linux-tools:
        A patch for Netware builds. This fixes problem with missing mysql_version.h during Linux
        tools building.
      netware/BUILD/compile-netware-END:
        A fix for Netware builds.
      netware/BUILD/mwenv:
        A fix for Netware builds, environment variables setup script.
      9d5e2e91
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 36947f19
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/mysql_priv.h:
        Auto merged
      36947f19
    • unknown's avatar
      Some Windows compile improvements: · a0d18bd4
      unknown authored
       - removed some unreferenced variables
       - fixed the libmysql project file by removing a duplicate file reference (merge error)
      
      
      sql/item_func.cc:
        - removed unused variable "Field" from Item_func_sp::sp_result_field
      sql/sql_select.cc:
        - removed unreferenced variable "filename" from create_tmp_table
      sql/unireg.cc:
        - removed unused variable "firstpos" from make_empty_rec
      VC++Files/libmysql/libmysql.dsp:
        - after-merge fix: removed duplicate file ctype-cp932.c
      a0d18bd4
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 4e125645
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      sql/sql_select.cc:
        Auto merged
      4e125645
    • unknown's avatar
      sp.test, sp.result: · 3b808af0
      unknown authored
        Added a test case for bug #6866.
      sql_select.cc:
        Fixed bug #6866.
        Bug was due to the fact that on_expr was not backed up
        for the second execution of the stored procedure.
      
      
      sql/sql_select.cc:
        Fixed bug #6866.
        Bug was due to the fact that on_expr was not backed up
        for the second execution of the stored procedure.
      mysql-test/r/sp.result:
        Added a test case for bug #6866.
      mysql-test/t/sp.test:
        Added a test case for bug #6866.
      3b808af0
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 22eeea04
      unknown authored
      into mysql.com:/usr/home/bar/mysql-5.0.turk
      
      
      22eeea04
    • unknown's avatar
      Bug#8610: The ucs2_turkish_ci collation fails with upper('i') · e7300f13
      unknown authored
        UPPER/LOWER now can return a string with different length.
      
      mi_test1.c:
        Adding new arguments.
      Many files:
        Changeing caseup/casedn to return a result with different
        length than argument.
      sql_string.h:
        Removing unused method,
      mysql_priv.h:
        Removing unused method
      
      
      strings/ctype-big5.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-bin.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-cp932.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-czech.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-euc_kr.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-extra.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-eucjpms.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-gb2312.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-gbk.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-latin1.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-mb.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-simple.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-sjis.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-tis620.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-uca.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-ucs2.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-ujis.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-utf8.c:
        Changeing caseup/casedn to return a result with different length than argument.
      strings/ctype-win1250ch.c:
        Changeing caseup/casedn to return a result with different length than argument.
      sql/item_strfunc.cc:
        Changeing caseup/casedn to return a result with different length than argument.
      sql/item_strfunc.h:
        Changeing caseup/casedn to return a result with different length than argument.
      sql/mysql_priv.h:
        Removing unused method
      sql/sql_string.h:
        Removing unused method,
      client/sql_string.h:
        Changeing caseup/casedn to return a result with different length than argument.
      include/m_ctype.h:
        Changeing caseup/casedn to return a result with different length than argument.
      myisam/mi_test1.c:
        Adding new arguments.
      mysql-test/r/ctype_uca.result:
        UPPER/LOWER now can return a string with different length.
      mysql-test/t/ctype_uca.test:
        UPPER/LOWER now can return a string with different length.
      e7300f13
    • unknown's avatar
      Portability fix, mySTL on Sun Forte 5.4. · e0ae1fa0
      unknown authored
      
      extra/yassl/mySTL/memory.hpp:
        Portability fix, mySTL on Sun Forte 5.4: default template arguments that
        are based on previous template argument don't work, just remove
        the fancy syntax (non-default second argument is not used anywhere
        anyway).
      e0ae1fa0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8ae95213
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sp_head.cc:
        Auto merged
      sql/sp_rcontext.cc:
        Auto merged
      8ae95213
    • unknown's avatar
      Fixed wrong key length when using MIN() optimization (non fatal, but caused... · cdb905ea
      unknown authored
      Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file)
      This fixed bug #11039: InnoDB: Warning: using a partial-field key prefix in search
      
      
      mysql-test/r/innodb.result:
        Added extra test for bug #11039: InnoDB: Warning: using a partial-field key prefix in search
      mysql-test/t/innodb.test:
        Added extra test for bug #11039: InnoDB: Warning: using a partial-field key prefix in search
      sql/opt_sum.cc:
        Fixed wrong key length when using MIN() optimization
      cdb905ea
    • unknown's avatar
      Futher fixes for aCC. · 09171d1b
      unknown authored
      
      extra/yassl/src/handshake.cpp:
        Further fixes for aCC: rewrite c-tor invocation to not require any
        optimization from the compiler.
      09171d1b
    • unknown's avatar
      Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX). · 29f18223
      unknown authored
      
      extra/yassl/taocrypt/src/misc.cpp:
        Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX):
        we can remove these 2 ifdefed statements, as new handlers are not used
        anymore (yaSSL new doesn't throw exceptions and does not
        calls/resets new handlers as prescribed in the standard), but let's
        leave it to Todd, now just #ifdef the problematic code.
      29f18223
    • unknown's avatar
      40beffdb
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · eff6187c
      unknown authored
      into mysql.com:/usr/home/ram/work/5.0.b10539
      
      
      eff6187c
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 595f63b3
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      595f63b3
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2d55dd5b
      unknown authored
      into mysql.com:/usr/home/ram/work/5.0.b10539
      
      
      sql/field.cc:
        Auto merged
      2d55dd5b