1. 31 Jul, 2006 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 4570ae7b
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      4570ae7b
    • unknown's avatar
      N'xxx' and _utf8'xxx' are not equivalent · 708e741b
      unknown authored
      Problem: Unescaping of '\' characters didn't work when processing N'xxx'.
      Fix: using get_text() instead of get_token() when scanning nationa strings.
      
      
      mysql-test/r/ctype_utf8.result:
        Adding test case
      mysql-test/t/ctype_utf8.test:
        Adding test case
      sql/sql_lex.cc:
        Fixing to process national strings using get_tex(),
        i.e. the same way with usual strings, to make
        unescaping work.
      708e741b
  2. 29 Jul, 2006 6 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · d55cc6b8
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      configure.in:
        Auto merged
      d55cc6b8
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · 5ae3d614
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      configure.in:
        Auto merged
      5ae3d614
    • unknown's avatar
      configure.in: · 7991d78a
      unknown authored
        Corrected typo
      
      
      configure.in:
        Corrected typo
      7991d78a
    • unknown's avatar
      Fix after manual merge. · 56fce638
      unknown authored
      
      tests/mysql_client_test.c:
        Fix after manual merge: add test for bug#21206.
      56fce638
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge · 4028d6ea
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
      
      
      configure.in:
        Auto merged
      man/Makefile.am:
        Auto merged
      mysys/my_bitmap.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/sql_locale.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Manual merge.
      sql/sql_select.cc:
        Manual merge.
      4028d6ea
    • unknown's avatar
      udf_example.c, udf.test, Makefile.am: · 6b6c1724
      unknown authored
        Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336)
      
      
      sql/Makefile.am:
        "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336)
      mysql-test/t/udf.test:
        "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336)
      sql/udf_example.c:
        Changes to be strict ansi, except long long
      6b6c1724
  3. 28 Jul, 2006 8 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · 608d7e92
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      configure.in:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/mysql.spec.sh:
        SCCS merged
      608d7e92
    • unknown's avatar
      Makefile.am, configure.in: · 4f0c394c
      unknown authored
        Man page for mysqld command move to section 8 (bug#21220)
      
      
      configure.in:
        Man page for mysqld command move to section 8 (bug#21220)
      man/Makefile.am:
        Man page for mysqld command move to section 8 (bug#21220)
      4f0c394c
    • unknown's avatar
      make_binary_distribution.sh: · 3423142a
      unknown authored
        Man page for "mysqld" command move to section 8 (bug#21220)
      
      
      scripts/make_binary_distribution.sh:
        Man page for "mysqld" command move to section 8 (bug#21220)
      3423142a
    • unknown's avatar
      mysql.spec.sh: · 00c97fe0
      unknown authored
        Man page for "mysqld" command move to section 8 (bug#21220)
      
      
      support-files/mysql.spec.sh:
        Man page for "mysqld" command move to section 8 (bug#21220)
      00c97fe0
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/tmp_merge · de11a26d
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      netware/BUILD/mwasmnlm:
        Auto merged
      netware/BUILD/mwccnlm:
        Auto merged
      netware/BUILD/mwldnlm:
        Auto merged
      de11a26d
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 40ea9e3f
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      sql/sql_select.cc:
        Auto merged
      40ea9e3f
    • unknown's avatar
      sql_select.cc: · 342ae61d
      unknown authored
        Renamed variable, to avoid name clash with macro "rem_size"
        on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
      asn.cpp, asn.hpp:
        Avoid name clash with NAME_MAX
      
      
      sql/sql_select.cc:
        Renamed variable, to avoid name clash with macro "rem_size"
        on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
      extra/yassl/taocrypt/src/asn.cpp:
        Avoid name clash with NAME_MAX
      extra/yassl/taocrypt/include/asn.hpp:
        Avoid name clash with NAME_MAX
      342ae61d
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · b0b5fc60
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/global-50
      
      b0b5fc60
  4. 27 Jul, 2006 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 090c339a
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      090c339a
    • unknown's avatar
      Revert the change after null-merge. · 155de819
      unknown authored
      
      mysys/my_bitmap.c:
        Revert the change forced during null-merge.
      155de819
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release · 646f2216
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main
      
      
      sql/sql_select.cc:
        Null-merge
      tests/mysql_client_test.c:
        Null-merge
      646f2216
    • unknown's avatar
      BUG#21206: memory corruption when too many cursors are opened at once · 23f3dd1d
      unknown authored
      Too many cursors (more than 1024) could lead to memory corruption.
      This affects both, stored routines and C API cursors, and the
      threshold is per-server, not per-connection.  Similarly, the
      corruption could happen when the server was under heavy load
      (executing more than 1024 simultaneous complex queries), and this is
      the reason why this bug is fixed in 4.1, which doesn't support
      cursors.
      
      The corruption was caused by a bug in the temporary tables code, when
      an attempt to create a table could lead to a write beyond allocated
      space.  Note, that only internal tables were affected (the tables
      created internally by the server to resolve the query), not tables
      created with CREATE TEMPORARY TABLE.  Another pre-condition for the
      bug is TRUE value of --temp-pool startup option, which, however, is a
      default.
      
      The cause of a bug was that random memory was overwritten in
      bitmap_set_next() due to out-of-bound memory access.
      
      
      mysys/my_bitmap.c:
        Local 'bitmap_size' is measured in bytes, no need to multiply it by 8.
      sql/sql_select.cc:
        Clear the temp_pool_slot bit only if we have set it previously.
      tests/mysql_client_test.c:
        Add test case for bug#21206: memory corruption when too many cursors
        are opened at once.
      23f3dd1d
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release · d4922cff
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main
      
      
      VC++Files/sql/mysqld.vcproj:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/warnings-master.opt:
        Auto merged
      mysql-test/t/warnings.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      d4922cff
  5. 26 Jul, 2006 2 commits
    • unknown's avatar
      Merge siva.hindu.god:/usr/home/tim/m/bk/global-41 · 05373cfe
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/global-50
      
      
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/field.cc:
        Auto merged
      05373cfe
    • unknown's avatar
      BUG#21206: memory corruption when too many cursors are opened at once · 3fcef0c7
      unknown authored
      Too many cursors (more than 1024) could lead to memory corruption.
      This affects both, stored routines and C API cursors, and the
      threshold is per-server, not per-connection.  Similarly, the
      corruption could happen when the server was under heavy load
      (executing more than 1024 simultaneous complex queries), and this is
      the reason why this bug is fixed in 4.1, which doesn't support
      cursors.
      
      The corruption was caused by a bug in the temporary tables code, when
      an attempt to create a table could lead to a write beyond allocated
      space.  Note, that only internal tables were affected (the tables
      created internally by the server to resolve the query), not tables
      created with CREATE TEMPORARY TABLE.  Another pre-condition for the
      bug is TRUE value of --temp-pool startup option, which, however, is a
      default.
      
      The cause of a bug was that random memory was overwritten in
      bitmap_set_next() due to out-of-bound memory access.
      
      
      mysys/my_bitmap.c:
        Local 'bitmap_size' is measured in bytes, no need to multiply it by 8.
      sql/sql_select.cc:
        Clear the temp_pool_slot bit only if we have set it previously.
      3fcef0c7
  6. 25 Jul, 2006 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 10cb018b
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      10cb018b
    • unknown's avatar
      Bug#20543 select on information_schema strange warnings, view, different schemas/users · eaf279df
      unknown authored
      The fix is: if user has privileges to view fields and user has any
      (insert,select,delete,update) privileges on underlying view 
      then 'show fields' and select from I_S.COLUMNS table are sucsessful.
      
      
      mysql-test/r/information_schema_db.result:
        Bug#20543 select on information_schema strange warnings, view, different schemas/users
        test result
      mysql-test/t/information_schema_db.test:
        Bug#20543 select on information_schema strange warnings, view, different schemas/users
        test case
      sql/sql_acl.cc:
        Bug#20543 select on information_schema strange warnings, view, different schemas/users
        checked that user has privileges on underlying view and if it's true
        set allowed_show to true for top view.
      sql/sql_show.cc:
        Bug#20543 select on information_schema strange warnings, view, different schemas/users
        removed unnecessary rights check.'tables->allowed_show' check is used instead
      sql/sql_view.cc:
        Bug#20543 select on information_schema strange warnings, view, different schemas/users
        skip the check of SHOW_VIEW_ACL privilege on underlying view. It is done later during
        execution of find_field_in_table_ref function.
      sql/table.h:
        Bug#20543 select on information_schema strange warnings, view, different schemas/users
        'allowed_show' is set during rights check for view. If true then user has privileges 
        for 'show create view', etc
      eaf279df
    • unknown's avatar
      "mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM build tests. · 5bbc62d8
      unknown authored
          (Re-apply a patch from the general tree to the clone.)
      
      
      mysql-test/mysql-test-run.pl:
        "mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM build tests.
        (Re-apply a patch from the general tree to the clone.)
      5bbc62d8
    • unknown's avatar
      slave.cc: · e902dc6f
      unknown authored
            BUG#20850: Assert during slave shutdown in many rpl_* tests
            This patch has already been applied to 5.1.
      
      
      sql/slave.cc:
            BUG#20850: Assert during slave shutdown in many rpl_* tests
            This patch has already been applied to 5.1.
      e902dc6f
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-4.1.mrg · af3674cc
      unknown authored
      into  mysql.com:/home/hf/work/mysql-5.0.mrg
      
      
      libmysqld/lib_sql.cc:
        Auto merged
      tests/mysql_client_test.c:
        merging
      af3674cc
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 29cb371c
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-kt
      
      29cb371c
  7. 24 Jul, 2006 10 commits
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · db3b590a
      unknown authored
      into  trift2.:/M41/push-4.1
      
      db3b590a
    • unknown's avatar
      Merge trift2.:/M41/clone-4.1 · d0e51004
      unknown authored
      into  trift2.:/M41/push-4.1
      
      
      sql/field.cc:
        Auto merged
      sql/sql_locale.cc:
        Changes were already present (and even better) == Null-merge == "ul".
      d0e51004
    • unknown's avatar
      Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows · 06c1c173
      unknown authored
       - Send confusing output to /dev/null
      
      
      mysql-test/t/mysqlbinlog.test:
        Send confusing error messages to /dev/null so they don't appear in erro log if test case fails
      06c1c173
    • unknown's avatar
      Merge trift2.:/M41/clone-4.1 · a7e2f2fe
      unknown authored
      into  trift2.:/M50/merge-4.1-to-5.0
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      VC++Files/libmysqld/libmysqld.vcproj:
        Auto merged
      VC++Files/libmysqld/libmysqld_ia64.dsp:
        Auto merged
      VC++Files/mysqldemb/mysqldemb.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsp:
        Auto merged
      VC++Files/sql/mysqld.vcproj:
        Auto merged
      VC++Files/sql/mysqld_ia64.dsp:
        Auto merged
      VC++Files/sql/mysqldmax.dsp:
        Auto merged
      sql/field.cc:
        Merge a backport == Null-merge == "ul".
      sql/field.h:
        Merge a backport == Null-merge == "ul".
      sql/sql_locale.cc:
        Changes were already present (and even better) == Null-merge == "ul".
      a7e2f2fe
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 536dabd0
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      
      client/mysql.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      536dabd0
    • unknown's avatar
      Merge trift2.:/M41/push-1-4.1 · 71a7524f
      unknown authored
      into  trift2.:/M50/merge-4.1-to-5.0
      
      
      strings/strtod.c:
        Manual merge: Null merge with header file cleanup ("my_base.h" includes "my_global.h", so we do not need both).
      71a7524f
    • unknown's avatar
      Merge trift2.:/M41/tmp_merge · d1b42560
      unknown authored
      into  trift2.:/M50/merge-4.1-to-5.0
      
      
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_locale.cc:
        Auto merged
      sql/item_timefunc.cc:
        Merging by "ul", as asked in the original changeset.
      support-files/mysql.spec.sh:
        Manual merge, keeping alphabetic order.
      d1b42560
    • unknown's avatar
      Merge trift2.:/M41/tmp_merge · 6a3f8efe
      unknown authored
      into  trift2.:/M50/merge-4.1-to-5.0
      
      
      support-files/mysql.spec.sh:
        Auto merged
      configure.in:
        Manual - "use local".
      6a3f8efe
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · 40029333
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
      
      40029333
    • unknown's avatar
      mwasmnlm, mwccnlm, mwldnlm: · 9ffa9d68
      unknown authored
        Filter out strange control characters, messes up logs
      
      
      netware/BUILD/mwasmnlm:
        Filter out strange control characters, messes up logs
      netware/BUILD/mwccnlm:
        Filter out strange control characters, messes up logs
      netware/BUILD/mwldnlm:
        Filter out strange control characters, messes up logs
      9ffa9d68
  8. 23 Jul, 2006 1 commit