1. 09 Jun, 2005 1 commit
    • unknown's avatar
      sql/mysql_priv.h · 9406b1eb
      unknown authored
          comments,
          unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed
          SELECT_ALL flag moved into this free slot.
      
      
      bdb/dist/configure.ac:
        don't link bdb with -pthread on FreeBSD
      extra/yassl/taocrypt/include/modes.hpp:
        fix alignment in yassl - proper fix is required
      sql/ha_berkeley.cc:
        remove unused flag OPTION_INTERNAL_SUBTRANSACTIONS
      sql/mysql_priv.h:
        comments,
        unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed
        SELECT_ALL flag moved into this free slot.
      9406b1eb
  2. 07 Jun, 2005 18 commits
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 · 383a7799
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      383a7799
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 81e45238
      unknown authored
      into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      81e45238
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 05767bd9
      unknown authored
      into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      05767bd9
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · a0c3d7ea
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      a0c3d7ea
    • unknown's avatar
      ndb - backup/restore, fix count of dist keys · 455e625c
      unknown authored
        better fix for bug#10190
      
      
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        better fix for bug#10190
      455e625c
    • unknown's avatar
      - manual merge of mysql.spec.sh · 10aca2db
      unknown authored
      
      scripts/Makefile.am:
        Auto merged
      support-files/mysql.spec.sh:
        - post merge fixes
      10aca2db
    • unknown's avatar
      innodb.result: · 7ccff7d4
      unknown authored
        Update Monty's tests for AUTO-INC bug #11080 and bug #11005
      
      
      mysql-test/r/innodb.result:
        Update Monty's tests for AUTO-INC bug #11080 and bug #11005
      7ccff7d4
    • unknown's avatar
      innodb.test: · 46649e88
      unknown authored
        Update Monty's tests for AUTO-INC bug #11080 and bug #11005
      
      
      mysql-test/t/innodb.test:
        Update Monty's tests for AUTO-INC bug #11080 and bug #11005
      46649e88
    • unknown's avatar
      innodb.result, innodb.test: · f734188f
      unknown authored
        Update Monty's tests for AUTO-INC bug #11080 and bug #11005
      
      
      mysql-test/t/innodb.test:
        Update Monty's tests for AUTO-INC bug #11080 and bug #11005
      mysql-test/r/innodb.result:
        Update Monty's tests for AUTO-INC bug #11080 and bug #11005
      f734188f
    • unknown's avatar
      ha_innodb.cc: · e4b83507
      unknown authored
        Update the InnoDB internal auto-inc counter in ::write_row() if the statement is a REPLACE that fails in a duplicate key error: REPLACE will handle duplicate key error, and the insert will eventually succeed; note that we did NOT change InnoDB's behavior in an UPDATE, because updating the auto-inc counter in an UPDATE would require a bigger patch (Bug #11005)
      
      
      sql/ha_innodb.cc:
        Update the InnoDB internal auto-inc counter in ::write_row() if the statement is a REPLACE that fails in a duplicate key error: REPLACE will handle duplicate key error, and the insert will eventually succeed; note that we did NOT change InnoDB's behavior in an UPDATE, because updating the auto-inc counter in an UPDATE would require a bigger patch (Bug #11005)
      e4b83507
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 240daca2
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      configure.in:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      240daca2
    • unknown's avatar
      Moved tc_log_page_waits outside HAVE_MMAP, · 87d6a922
      unknown authored
      because it's used also outside.
      
      
      87d6a922
    • unknown's avatar
      A fix for systems that don't have HAVE_MMAP defined. · 9fae5188
      unknown authored
      Moved some variable externs from sql_class.h to mysql_priv.h
      
      
      sql/mysql_priv.h:
        Moved variables from sql_class.h to mysql_priv.h
      sql/mysqld.cc:
        Didn't compile, if HAVE_MMAP was not defined (Netware for example)
      sql/sql_class.h:
        Moved variables.
      9fae5188
    • unknown's avatar
      - BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_distribution" · 420a1b5d
      unknown authored
        when doing "make install" (they are not needed/useful) outside the build tree. Added
        "mysql_client_test" to the "MySQL-bench" RPM.
      - some small RPM spec file improvements (more variables than hard-coded values, cleanups)
      
      
      scripts/Makefile.am:
        - no need to install "make_win_src_distribution" and "make_win_binary_distribution"
          in "make install" (BUG#10676)
      support-files/mysql.spec.sh:
        - added mysql_client_test to the "bench" subpackage (BUG 10676)
        - use "mysqldatadir" variable instead of hard-coding the path multiple times
        - use the "mysqld_user" variable on all occasions a user name is referenced
        - removed (incomplete) Brazilian translations
        - removed redundant release tags from the subpackage descriptions
      420a1b5d
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2ce5fb13
      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
      2ce5fb13
    • unknown's avatar
      merge · 679d4470
      unknown authored
      679d4470
    • unknown's avatar
      After merge fixes · c5715964
      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
      c5715964
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · e2b6613a
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      e2b6613a
  3. 06 Jun, 2005 21 commits
    • unknown's avatar
      Merge with 4.1 · 3cad8ce5
      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
      3cad8ce5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 064ff6b4
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      064ff6b4
    • unknown's avatar
      Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE · 88e2a779
      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
      88e2a779
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · 33438ed0
      unknown authored
      into monster.:D:/Work/mysql5.0
      
      33438ed0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7824e00d
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      7824e00d
    • unknown's avatar
      fixes for compiler warnings from VC6 · dd00eae5
      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
      dd00eae5
    • unknown's avatar
      ctype_cp1250_ch.result, ctype_cp1250_ch.test: · aada5703
      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.
      aada5703
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · c9fb4fe5
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      c9fb4fe5
    • unknown's avatar
      A logger patch for Netware. · 8624fa14
      unknown authored
      8624fa14
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5296d46f
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      5296d46f
    • unknown's avatar
      A fix for Metrowerks compiler. · 34181337
      unknown authored
      
      netware/BUILD/mwenv:
        A fix for Metrowerks compiler, compiler option to change enum size
        from 2 bytes to 4 bytes.
      34181337
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c7329936
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      c7329936
    • unknown's avatar
      Some fixes for Netware. · f511c20d
      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.
      f511c20d
    • unknown's avatar
      Some fixes for Netware builds. · ef10fe6d
      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.
      ef10fe6d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ae96bf1a
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/mysql_priv.h:
        Auto merged
      ae96bf1a
    • unknown's avatar
      Some Windows compile improvements: · 885176d3
      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
      885176d3
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 4039f58c
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      sql/sql_select.cc:
        Auto merged
      4039f58c
    • unknown's avatar
      sp.test, sp.result: · d9cb08b5
      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.
      d9cb08b5
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 617b2e65
      unknown authored
      into mysql.com:/usr/home/bar/mysql-5.0.turk
      
      617b2e65
    • unknown's avatar
      Bug#8610: The ucs2_turkish_ci collation fails with upper('i') · 403a6cf9
      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.
      403a6cf9
    • unknown's avatar
      Portability fix, mySTL on Sun Forte 5.4. · e9d65468
      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).
      e9d65468