1. 03 May, 2006 1 commit
  2. 02 May, 2006 16 commits
    • unknown's avatar
      Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 · 5d8f7471
      unknown authored
      into  mysql.com:/home/dlenev/mysql-5.1-merges
      
      
      VC++Files/mysql.sln:
        Auto merged
      VC++Files/mysys/mysys.vcproj:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/timezone2.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      sql/tztime.h:
        Auto merged
      tests/Makefile.am:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      5d8f7471
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 30e6df0e
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
      
      
      30e6df0e
    • unknown's avatar
      More merging assistence. · 567ae0ca
      unknown authored
      Logging behavior changed in early 5.1.  (The filename was never right, but
      the "opt" file is unnecessary in 5.0 anyway.)
      
      
      mysql-test/t/mysql_client_test-master.opt:
        Logging behavior changed in early 5.1.
      567ae0ca
    • unknown's avatar
      Manually merged · d6c25884
      unknown authored
      d6c25884
    • unknown's avatar
      Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667 · fa5feec0
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
      
      
      include/my_sys.h:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      tests/Makefile.am:
        Auto merged
      fa5feec0
    • unknown's avatar
      An update to as-yet unused new feature of snprintf, which was added to bring · 28d799f1
      unknown authored
      our sprintf()-alike in sync with our fprintf()-alike features.
      
      
      strings/my_vsnprintf.c:
        Advance the destination pointer properly.
        
        Also, pay attention to the "n" in snprintf() -- never write too much.
      28d799f1
    • unknown's avatar
      Fix spelling in comments as requested by Osku · e8770dfe
      unknown authored
      This will make charset code easier to understand
      
      
      include/m_ctype.h:
        Fix spelling in comments
      mysql-test/t/cast.test:
        Fix spelling in comments
      mysql-test/t/query_cache.test:
        Fix spelling in comments
      sql/sql_string.cc:
        Fix spelling in comments
      strings/CHARSET_INFO.txt:
        Fix spelling in comments
      e8770dfe
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 853f5413
      unknown authored
      into  mysql.com:/home/dlenev/mysql-5.0-bg11081
      
      
      853f5413
    • unknown's avatar
      WL#2257 REFERENTIAL_CONSTRAINTS view · 79cc1546
      unknown authored
      added I_S.REFARENTIAL_CONSTRAINTS table
      
      
      mysql-test/r/information_schema.result:
        WL#2257 REFERENTIAL_CONSTRAINTS view
         result fix
      mysql-test/r/information_schema_db.result:
        WL#2257 REFERENTIAL_CONSTRAINTS view
         result fix
      mysql-test/r/information_schema_inno.result:
        WL#2257 REFERENTIAL_CONSTRAINTS view
         test case
      mysql-test/t/information_schema_inno.test:
        WL#2257 REFERENTIAL_CONSTRAINTS view
         test case
      sql/ha_innodb.cc:
        WL#2257 REFERENTIAL_CONSTRAINTS view
      79cc1546
    • unknown's avatar
      Fix a bunch of non-Linux compile failures. · 33417297
      unknown authored
      
      VC++Files/mysql.sln:
        mysql_client_test depends on mysys.
      VC++Files/mysys/mysys.vcproj:
        Add new file missing in previous push.
      mysys/my_memmem.c:
        Fix illegal pointer arithmetics on void *.
      tests/Makefile.am:
        -L must go before -l
      tests/mysql_client_test.c:
        No declarations after statement in C code.
      33417297
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · a8295654
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.clean
      
      
      a8295654
    • unknown's avatar
      Win build fix · 521d6b3d
      unknown authored
      521d6b3d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4d1cd02e
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
      
      
      mysys/Makefile.am:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      4d1cd02e
    • unknown's avatar
      SECURITY FIX · 3010890e
      unknown authored
      Bug#17667: An attacker has the opportunity to bypass query logging.
      
      This adds a new, local-only printf format specifier to our *printf functions
      that allows us to print known-size buffers that must not be interpreted as 
      NUL-terminated "strings."
      
      It uses this format-specifier to print to the log, thus fixing this 
      problem.
      
      
      include/my_sys.h:
        Add prototype for my_memmem() .
      mysys/Makefile.am:
        Add reference to new file, my_memmem.c
      mysys/mf_iocache2.c:
        Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
        but unlike the string-indicator, it requires the width and doesn't stop printing
        at NUL characters.
        
        Also, simplify the code a bit.
        
        TODO:  This code should be unified with the strings/my_vnsprintf.c code in 
        the future.
      sql/sql_parse.cc:
        The query is not a C-string, but is a sized buffer, containing any character 
        at all, which may include NUL characters.
      strings/my_vsnprintf.c:
        Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
        but unlike the string-indicator, it requires the width and doesn't stop printing
        at NUL characters.
      tests/Makefile.am:
        We may need some of our local functions.
      tests/mysql_client_test.c:
        Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
        but unlike the string-indicator, it requires the width and doesn't stop printing
        at NUL characters.
      mysql-test/t/mysql_client_test.opt:
        New BitKeeper file ``mysql-test/t/mysql_client_test.opt''
        
        Add '--log' server parameter.
      mysys/my_memmem.c:
        New BitKeeper file ``mysys/my_memmem.c''
        
        Implement memmem, a black-box work-alike of the GNU memmem(), which functions
        like strstr() but for arbitrary blocks of memory.
      3010890e
    • unknown's avatar
      Merge · fb2c04a1
      unknown authored
      
      configure.in:
        Auto merged
      include/config-win.h:
        Auto merged
      fb2c04a1
    • unknown's avatar
      Fix name of error in view_grant test · 768e5dcc
      unknown authored
      
      mysql-test/t/view_grant.test:
        Fix error name
      768e5dcc
  3. 01 May, 2006 13 commits
  4. 30 Apr, 2006 4 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-clean · c3c5f8d6
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.1-clean
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-mysql_upgrade.dsp:
        Delete: VC++Files/client/mysql_upgrade.dsp
      BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
        Delete: VC++Files/client/mysql_upgrade_ia64.dsp
      BitKeeper/deleted/.del-mysql_upgrade.c:
        Delete: client/mysql_upgrade.c
      VC++Files/mysql.dsw:
        Auto merged
      VC++Files/mysql.sln:
        Auto merged
      VC++Files/mysql_ia64.dsw:
        Auto merged
      client/mysql.cc:
        Auto merged
      config/ac-macros/zlib.m4:
        Auto merged
      configure.in:
        Auto merged
      extra/yassl/Makefile.am:
        Auto merged
      extra/yassl/taocrypt/Makefile.am:
        Auto merged
      include/my_global.h:
        Auto merged
      include/mysql.h:
        Auto merged
      libmysql/libmysql.def:
        Auto merged
      libmysqld/libmysqld.def:
        Auto merged
      mysql-test/r/grant2.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/grant2.test:
        Auto merged
      mysql-test/t/rpl_openssl.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      client/Makefile.am:
        Resolve conflict
      config/ac-macros/yassl.m4:
        Resolve conflict
      mysql-test/include/have_udf.inc:
        Resolve conflict
      mysql-test/lib/mtr_process.pl:
        Resolve conflict
      mysql-test/mysql-test-run.pl:
        Resolve conflict
      mysql-test/r/have_udf.require:
        Resolve conflict
      mysql-test/r/rpl_openssl.result:
        Resolve conflict
      mysql-test/t/disabled.def:
        Resolve conflict
      mysql-test/t/information_schema.test:
        Resolve conflict
      server-tools/instance-manager/instance_options.cc:
        Resolve conflict
      sql/mysql_priv.h:
        Resolve conflict
      sql/set_var.cc:
        Resolve conflict
      support-files/mysql.spec.sh:
        Resolve conflict
      c3c5f8d6
    • unknown's avatar
      Fix error in having.test to use name instead of number (fixes merge problem) · 383d35eb
      unknown authored
      
      mysql-test/t/having.test:
        Use error name instead of number
      383d35eb
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/tmp_merge · 9f7548ae
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.1-clean
      
      
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Resolve conflict
      mysql-test/ndb/ndbcluster.sh:
        Resolve conflict
      sql/set_var.cc:
        Resolve conflict
      sql/share/errmsg.txt:
        Resolve conflict
      9f7548ae
    • unknown's avatar
      Merge zim.(none):/home/brian/mysql/tmp_merge · 472f4a84
      unknown authored
      into  zim.(none):/home/brian/mysql/merge-5.1
      
      
      sql/ha_archive.cc:
        Merge to remove writes. Also removed one unneeded DBUG_PRINT
      sql/ha_archive.h:
        Merge
      472f4a84
  5. 29 Apr, 2006 3 commits
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 180cecdc
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
      
      
      180cecdc
    • unknown's avatar
      config-win.h: · 59a73f17
      unknown authored
        Fix strange "double" define for popen.
        Avoid warnings about sprintf() etc. being unsafe.
        Corrected typo "#endfif"
      
      
      include/config-win.h:
        Fix strange "double" define for popen.
        Avoid warnings about sprintf() etc. being unsafe.
        Corrected typo "#endfif"
      59a73f17
    • unknown's avatar
      configure.in: · 4fadc751
      unknown authored
        Changed version to 4.1.20
      
      
      configure.in:
        Changed version to 4.1.20
      4fadc751
  6. 28 Apr, 2006 3 commits
    • unknown's avatar
      mysql.spec.sh: · 9cffcab4
      unknown authored
        Backport of changes in 5.0 (bug#18294)
      
      
      support-files/mysql.spec.sh:
        Backport of changes in 5.0 (bug#18294)
      9cffcab4
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · fb7a6143
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
      
      
      fb7a6143
    • unknown's avatar
      BUG#19145: mysqld crashes if you set the default value of an enum field to NULL · dd68976a
      unknown authored
      Now test for NULLness the pointers returned from objects created from the
      default value. Pushing patch on behalf of cmiller.
      
      
      mysql-test/r/null.result:
        Add test case
      mysql-test/t/null.test:
        Add test case
      sql/sql_table.cc:
        No longer blindly dereference pointer of the string representation of the
        values, where "NULL" is NUL. Raise INVALID DEFAULT error messages where
        appropriate.
        
        Note that the -O1 optimization flag made debugging this extremely tricky, with
        misleading results, and that removing it from the Makefile during debugging can
        be invaluable.
      dd68976a