1. 16 Mar, 2006 18 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · fca35216
      unknown authored
      into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
      
      
      fca35216
    • unknown's avatar
      CMake Windows comp_error dependency fix after last push. · 40eb9b87
      unknown authored
      
      extra/cmakelists.txt:
        Another attempt at fixing the comp_err/GenError dependency problem.
      sql/cmakelists.txt:
        Another attempt at fixing the comp_err/GenError dependency problem.
      client/cmakelists.txt:
        Another attempt at fixing the comp_err/GenError dependency problem.
      libmysql/cmakelists.txt:
        Another attempt at fixing the comp_err/GenError dependency problem.
      server-tools/instance-manager/cmakelists.txt:
        Another attempt at fixing the comp_err/GenError dependency problem.
      40eb9b87
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 27978ba2
      unknown authored
      into lmy004.:/work/mysql-5.1-bug14356
      
      
      27978ba2
    • unknown's avatar
      Merge acurtis@bk-internal:/home/bk/mysql-5.1-new · 816bd99b
      unknown authored
      into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2
      
      
      816bd99b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 5c9359c3
      unknown authored
      into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
      
      
      5c9359c3
    • unknown's avatar
      Fix Windows CMake dependency problem. · 6091d5c7
      unknown authored
      
      client/cmakelists.txt:
        Fix dependency problem with the old GenError target.
      extra/cmakelists.txt:
        Fix dependency problem with the old GenError target.
      libmysql/cmakelists.txt:
        Fix dependency problem with the old GenError target.
      server-tools/instance-manager/cmakelists.txt:
        Fix dependency problem with the old GenError target.
      sql/cmakelists.txt:
        Fix dependency problem with the old GenError target.
      win/README:
        Fix dependency problem with the old GenError target.
      6091d5c7
    • unknown's avatar
      Merge xiphis.org:/home/antony/work2/p1-bug14575.1 · 9d233a17
      unknown authored
      into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2
      
      
      include/config-win.h:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/mysql_priv.h:
        merge bug#14575 forwards
      sql/mysqld.cc:
        merge bug#14575 forwards
      9d233a17
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · dc546f52
      unknown authored
      into lmy004.:/work/mysql-5.1-bug14356
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      dc546f52
    • unknown's avatar
      fix for bug 16408 (Events: crash for an event in a procedure) · 06dd9764
      unknown authored
      (one patch)
      
      
      mysql-test/r/events_bugs.result:
        fix for bug 16408
      mysql-test/t/events_bugs.test:
        fix for bug 16408
      sql/event.h:
        fix for bug 16408
      sql/event_timed.cc:
        fix for bug 16408
      sql/sql_parse.cc:
        fix for bug 16408
      sql/sql_yacc.yy:
        fix for bug 16408
      06dd9764
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3b0ea155
      unknown authored
      into  zim.(none):/home/mikael/bug17772
      
      
      3b0ea155
    • unknown's avatar
      BUG#17772 · 01cce283
      unknown authored
      A crash after ALTER TABLE t1 RENAME ...
      
      
      mysql-test/r/partition.result:
        New test case
      mysql-test/t/partition.test:
        New test case
      sql/sql_lex.h:
        Introduced like name for CREATE TABLE t1 LIKE t2
      sql/sql_parse.cc:
        Introduced like name for CREATE TABLE t1 LIKE t2
      sql/sql_partition.cc:
        Introduced like name for CREATE TABLE t1 LIKE t2
      sql/sql_yacc.yy:
        Introduced like name for CREATE TABLE t1 LIKE t2
      01cce283
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-4.1 · 28109fed
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.1-new
      
      
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      28109fed
    • unknown's avatar
      Fix bug in mysql-test-run.pl in ^C signal handler. · fd6d45f0
      unknown authored
      
      mysql-test/lib/mtr_timer.pl:
        Fix bug where ^C would trigger cleanup handler in both parent and
        timeout child processes, causing duplicated messages and potential
        conflicts.
      fd6d45f0
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 978c8992
      unknown authored
      into  xiphis.org:/home/antony/work2/p1-bug14575.1
      
      
      978c8992
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/bug18195/my50-bug18195 · 4f1685f6
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0
      
      
      4f1685f6
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.1-new · 2d360cd0
      unknown authored
      into  mysql.com:/home/bk/b17400-mysql-5.1-new
      
      
      2d360cd0
    • unknown's avatar
      Bug#17400 (RBR: replication of delete and update fails for tables w/o PK): · 3b770ea9
      unknown authored
      Unable to reproduce failure: some of the 17400 tests pass, other have other failures.
      The test in the bug report passes.
      Enabling some tests that pass, rebranding others.
      
      
      mysql-test/t/disabled.def:
        Enabling tests that pass
        Rebranding disabled tests
      3b770ea9
    • unknown's avatar
      Bug#14575 · 78e37021
      unknown authored
        ¨MySQL server crashes if you try to access to InnoDB table¨
        crash caused by schizophrenic mysqld - 2 memory locations for logically same function
        with conflicting values.
        Fixed by backporting from 5.1 changes to have_xyz_db declarations.
      
      
      sql/mysql_priv.h:
        Backport have_xyz_db changes from 5.1
      sql/mysqld.cc:
        Backport have_xyz_db changes from 5.1
      78e37021
  2. 15 Mar, 2006 11 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 902449b5
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.1-root
      
      
      902449b5
    • unknown's avatar
      A fix and test case for Bug#16164 "Easter egg": · 271d20ba
      unknown authored
      SHOW AUTHORS caused 'Packets out of order' in stored functions:
      add the corresponding SQLCOM to sp_get_flags_for_command so that
      it'd return sp-related flags for it. 
      Fix Bug#17403 "Events: packets out of order with show create event"
      in the same chaneset.
      
      
      mysql-test/r/events.result:
        Update the results (Bug#17403)
      mysql-test/r/sp-error.result:
        Test results fixed (Bug#16164)
      mysql-test/t/events.test:
        Add a test case for Bug#17403 "Events: packets out of order with
        show create event"
      mysql-test/t/sp-error.test:
        Add a test case for Bug#16164 "Easter egg"
      sql/sp_head.cc:
        Add SHOW AUTHORS to the list of commands that return a result
        set: such commands are not allowed in stored functions and
        triggers. Add SHOW CREATE EVENT for the same reason.
      271d20ba
    • unknown's avatar
      Removed calls to deploy.bat from the build scripts since the cmake scripts are now · a477e78b
      unknown authored
      out in the target directories.
      
      
      
      
      a477e78b
    • unknown's avatar
      Moved cmake scripts into the proper directories · 66f7f086
      unknown authored
      
      sql/cmakelists.txt:
        Rename: sql/sql -> sql/cmakelists.txt
      zlib/cmakelists.txt:
        Rename: win/cmakefiles/zlib -> zlib/cmakelists.txt
      vio/cmakelists.txt:
        Rename: win/cmakefiles/vio -> vio/cmakelists.txt
      regex/cmakelists.txt:
        Rename: win/cmakefiles/regex -> regex/cmakelists.txt
      mysys/cmakelists.txt:
        Rename: win/cmakefiles/mysys -> mysys/cmakelists.txt
      cmakelists.txt:
        Rename: win/cmakefiles/base -> cmakelists.txt
      dbug/cmakelists.txt:
        Rename: win/cmakefiles/dbug -> dbug/cmakelists.txt
      strings/cmakelists.txt:
        Rename: win/cmakefiles/strings -> strings/cmakelists.txt
      libmysql/cmakelists.txt:
        Rename: win/cmakefiles/libmysql -> libmysql/cmakelists.txt
      client/cmakelists.txt:
        Rename: win/cmakefiles/client -> client/cmakelists.txt
      extra/cmakelists.txt:
        Rename: win/cmakefiles/extra -> extra/cmakelists.txt
      tests/cmakelists.txt:
        Rename: win/cmakefiles/tests -> tests/cmakelists.txt
      server-tools/instance-manager/cmakelists.txt:
        Rename: win/cmakefiles/im -> server-tools/instance-manager/cmakelists.txt
      storage/heap/cmakelists.txt:
        Rename: win/cmakefiles/heap -> storage/heap/cmakelists.txt
      storage/myisam/cmakelists.txt:
        Rename: win/cmakefiles/myisam -> storage/myisam/cmakelists.txt
      storage/myisammrg/cmakelists.txt:
        Rename: win/cmakefiles/myisammrg -> storage/myisammrg/cmakelists.txt
      storage/bdb/cmakelists.txt:
        Rename: win/cmakefiles/bdb -> storage/bdb/cmakelists.txt
      storage/innobase/cmakelists.txt:
        Rename: win/cmakefiles/innobase -> storage/innobase/cmakelists.txt
      extra/yassl/cmakelists.txt:
        Rename: win/cmakefiles/yassl -> extra/yassl/cmakelists.txt
      extra/yassl/taocrypt/cmakelists.txt:
        Rename: win/cmakefiles/taocrypt -> extra/yassl/taocrypt/cmakelists.txt
      BitKeeper/deleted/.del-deploy.bat~f6b42340:
        Delete: win/cmakefiles/deploy.bat
      66f7f086
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.1-new · 0a914654
      unknown authored
      into  mysql.com:/home/bk/b17400-mysql-5.1-new
      
      
      0a914654
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d38785aa
      unknown authored
      into  xgeek.:C:/work/mysql-5.1
      
      
      d38785aa
    • unknown's avatar
      README: · f70aa027
      unknown authored
        new file
      
      
      f70aa027
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new/ · 4a4b6577
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new.b18171
      
      
      4a4b6577
    • unknown's avatar
      Bug#18250 (Truncate table replicate both as statement and as individual · afab172a
      unknown authored
                 rows for SEs using injector):
      Table truncation ("DELETE FROM t1" and "TRUNCATE t1") was logged as
      a statement even when the storage engine deletes the rows individually
      using the injector.
      
      
      sql/sql_delete.cc:
        Don't log a truncate statement if the storage engine is using the injector.
      afab172a
    • unknown's avatar
      sql: · 03e84028
      unknown authored
        removed double entries for sql_yacc.* and added -p MYSQL define to call to bison
      
      
      win/cmakefiles/sql:
        removed double entries for sql_yacc.* and added -p MYSQL define to call to bison
      03e84028
    • unknown's avatar
      xml.result, xml.test: · 1dc87feb
      unknown authored
        Adding test.
      item_xmlfunc.cc:
        Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
        Disallowing use of position() and last() without context.
      
      
      sql/item_xmlfunc.cc:
        Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
        Disallowing use of position() and last() without context.
      mysql-test/t/xml.test:
        Adding test.
      mysql-test/r/xml.result:
        Adding test.
      1dc87feb
  3. 14 Mar, 2006 11 commits