1. 13 Feb, 2005 2 commits
    • unknown's avatar
      row0mysql.c: · 26c1bc50
      unknown authored
        Fix memory corruption bug reported by Georg Richter: if one created a table whose primary key contained at least 2 column prefixes, that could corrupt the memory heap of prebuilt_t
      
      
      innobase/row/row0mysql.c:
        Fix memory corruption bug reported by Georg Richter: if one created a table whose primary key contained at least 2 column prefixes, that could corrupt the memory heap of prebuilt_t
      26c1bc50
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl · 2233f624
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
      
      2233f624
  2. 12 Feb, 2005 2 commits
  3. 11 Feb, 2005 11 commits
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 35e24fcb
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      35e24fcb
    • unknown's avatar
      Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 · 7d69e469
      unknown authored
      
      Build-tools/Do-compile:
        Auto merged
      7d69e469
    • unknown's avatar
      After merge fix. · 2c9ea337
      unknown authored
      2c9ea337
    • unknown's avatar
      Merge · 7e170531
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/triggers/post-commit:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/table.cc:
        SCCS merged
      7e170531
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · c98f2bfc
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-bug8306
      
      c98f2bfc
    • unknown's avatar
      Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1 · 79d39787
      unknown authored
      
      Build-tools/Do-compile:
        Auto merged
      79d39787
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 0988260d
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      extra/replace.c:
        Auto merged
      0988260d
    • unknown's avatar
      select.result: · ae3216ef
      unknown authored
        Adjusted results of the test case for bug #7520 for 4.1.
      
      
      mysql-test/r/select.result:
        Adjusted results of the test case for bug #7520 for 4.1.
      ae3216ef
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0 · 77890702
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      extra/replace.c:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/table.cc:
        Auto merged
      77890702
    • unknown's avatar
      select.result, select.test: · 0ba0d09a
      unknown authored
        Added a test case for bug #7520.
      table.cc:
        Fixed bug #7520.
        The bug was caused by a wrong calculation of the field max_key_length for
        a TABLE structure when there was an index on a blob field.
      
      
      sql/table.cc:
        Fixed bug #7520.
        The bug was caused by a wrong calculation of the field max_key_length for
        a TABLE structure when there was an index on a blob field.
      mysql-test/t/select.test:
        Added a test case for bug #7520.
      mysql-test/r/select.result:
        Added a test case for bug #7520.
      0ba0d09a
    • unknown's avatar
      Set of fixes requested by Kent in IRC. Tested (except the windows changes... · 12ee8324
      unknown authored
      Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks...
      
      
      VC++Files/tests/mysql_client_test.dsp:
        fix request by Kent
      sql/item.cc:
        fix requested by kent
      12ee8324
  4. 10 Feb, 2005 22 commits
    • unknown's avatar
      Merge commit trigger · e042d67c
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      extra/replace.c:
        Auto merged
      BitKeeper/triggers/post-commit:
        Merge changes
      e042d67c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0 · 836822c6
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.0-clean
      
      836822c6
    • unknown's avatar
    • unknown's avatar
      BUG#6749: If there is no current database, then nothing should be binlogged if · d57dbbab
      unknown authored
      binlog-do-db or binlog-ignore-db are in effect.   (In the future 5.1? 5.0? I think 
      each statement should be verified against the filtering criteria based on the database
      it *uses* and not the *current* one.  But, right now the *current* database is what 
      counts according to the semantics of the manual.)
      
      
      sql/log.cc:
        BUG#6749: If there is no current database, then nothing should be binlogged if
        binlog-do-db or binlog-ignore-db are in effect.   (In the future I think that each 
        statement should be verified against the filtering criteria based on the database
        it *uses* and not the *current* one.  But, right now the *current* database is what 
        counts according to the semantics of the manual.)
      d57dbbab
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0 · b43a8e84
      unknown authored
      into mysql.com:/home/bk/b7853-mysql-5.0
      
      
      client/mysqlbinlog.cc:
        Auto merged
      mysql-test/r/mysqlbinlog.result:
        Auto merged
      b43a8e84
    • unknown's avatar
      Bug#8391 - "merge" fails on Linux/IA64 · a6d2079f
      unknown authored
      It was a thread stack overrun.
      IA64 had its own stack size section already.
      Enlarged its default stack size from 192K to 256K.
      
      a6d2079f
    • unknown's avatar
      Merge mysql.com:/home/kostja/work/mysql-4.1-root · 736f9b4b
      unknown authored
      into mysql.com:/home/kostja/work/mysql-5.0-root
      
      
      libmysql/libmysql.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      736f9b4b
    • unknown's avatar
      Follow-up for bug#7990 · aefda25b
      unknown authored
      
      libmysql/libmysql.c:
        And now put it to the proper place and make it work (Bug#7990)
      tests/mysql_client_test.c:
        Enable the test for bug#7990
      aefda25b
    • unknown's avatar
      Merge mysql.com:/home/kostja/work/mysql-4.1-root · b99dd022
      unknown authored
      into mysql.com:/home/kostja/work/mysql-5.0-root
      
      
      libmysql/libmysql.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      b99dd022
    • unknown's avatar
      Fix -ansi -pedantic compilation failure. · 9d1c4278
      unknown authored
      9d1c4278
    • unknown's avatar
      A fix and test case for Bug#7990 "mysql_stmt_close doesn't · 7723f994
      unknown authored
      reset mysql->net.last_error": the solution is to clear
      MYSQL->net error before performing COM_CLOSE: if the call
      succeeds, the connection is usable for other statements.
      More comprehensive fix is to clear MYSQL->net for all
      recoverable errors at the time they happen, it will be
      implemented in 5.0 as it introduces incompatibility in behavior.
      
      
      libmysql/libmysql.c:
        A simple fix for Bug#7990 "mysql_stmt_close doesn't reset 
        mysql->net.last_error"
      tests/mysql_client_test.c:
        A test case for Bug#7990 " mysql_stmt_close doesn't reset 
        mysql->net.last_error"
      7723f994
    • unknown's avatar
      manual merge · ee9644aa
      unknown authored
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      ee9644aa
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 397f09b4
      unknown authored
      into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      397f09b4
    • unknown's avatar
      Things missing in last changset · 16bfc65d
      unknown authored
      After merge fixes
      Don't give duplicate warnings for some ::store() functions
      
      
      mysql-test/mysql-test-run.sh:
        Added back missing line
      mysql-test/r/ps_2myisam.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_3innodb.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_4heap.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_5merge.result:
        Update results after removing duplicate warnings from ::store()
      sql/field.cc:
        Don't give duplicate warnings for some ::store() functions
        Before we could get different number of warnings in the test suite for different platforms
      sql/field.h:
        Update results after removing duplicate warnings from ::store()
      sql/sql_class.h:
        Update results after removing duplicate warnings from ::store()
      sql/sql_error.cc:
        Update results after removing duplicate warnings from ::store()
      sql/sql_list.h:
        After merge fix
      16bfc65d
    • unknown's avatar
      e8070e9e
    • unknown's avatar
      Change 'Build-tools/Do-compile' from 'system("rm -f ...");' to 'unlink()' to ensure · b2eb50d2
      unknown authored
      it also works on file names with special characters.
      
      
      Build-tools/Do-compile:
        Ever and again, some test creates a file name with special characters that need to be
        escaped when passed to the shell; as this is not done, 'system("rm -f ...");' fails
        on them, the old test tree is not deleted, and the build fails.
        Prevent this by changing to Perl 'unlink()' which does not need escaping.
      b2eb50d2
    • unknown's avatar
      Change script to avoiud multiple --debug flags when starting master servers · 603a6ed7
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Use local var for the individulisation of tracefile name
      603a6ed7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e1e04829
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      e1e04829
    • unknown's avatar
      A fix and test case for Bug#8330 "mysql_stmt_execute crashes" (libmysql). · a3fcd3a0
      unknown authored
      
      libmysql/libmysql.c:
        Fix for bug#8330 "mysql_stmt_execute crashes": we need to bail out
        from mysql_stmt_execute if mysql->net is occupied with a result set of
        another statement. Otherwise on the next attempt to use net we get
        a crash, as it's freed in case of error.
      tests/mysql_client_test.c:
        A test case for Bug#8330 "mysql_stmt_execute craches" (libmysql)
      a3fcd3a0
    • unknown's avatar
      Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc. · 1b965096
      unknown authored
      
      sql/sql_parse.cc:
        Added missing #ifdef HAVE_INNOBASE_DB:s.
      1b965096
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-zlib · 71a1872d
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      71a1872d
    • unknown's avatar
      Merge with 4.1 · 4fca2103
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysqltest.c:
        Auto merged
      extra/my_print_defaults.c:
        Auto merged
      extra/perror.c:
        Auto merged
      extra/resolve_stack_dump.c:
        Auto merged
      include/help_end.h:
        Auto merged
      include/help_start.h:
        Auto merged
      myisam/myisamlog.c:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/heap_hash.result:
        Auto merged
      BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      ndb/src/kernel/vm/FastScheduler.cpp:
        Auto merged
      netware/mysql_test_run.c:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      netware/BUILD/nwbootstrap:
        merge: keep local
      scripts/make_binary_distribution.sh:
        merge: keep local
      sql/ha_heap.cc:
        Trivial merge
      sql/ha_innodb.cc:
        Auto merge (Code already existed in 5.0)
      sql/item_cmpfunc.cc:
        Simple merge
      sql/item_func.cc:
        Simple merge
      sql/item_row.cc:
        Simple merge
      sql/item_strfunc.cc:
        Simple merge
      sql/item_subselect.cc:
        Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
      4fca2103
  5. 09 Feb, 2005 3 commits