1. 17 Feb, 2005 1 commit
  2. 16 Feb, 2005 11 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 96f9c9d9
      unknown authored
      into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
      
      
      sql/ha_innodb.cc:
        Auto merged
      96f9c9d9
    • unknown's avatar
      Merge · dd13aeb7
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      include/config-win.h:
        SCCS merged
      dd13aeb7
    • unknown's avatar
      Bug#4445 · eab44eaa
      unknown authored
        Make a more informative platform info for Windows
      
      
      eab44eaa
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · c3dec835
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
      
      
      c3dec835
    • unknown's avatar
      ndb - fix old decimal type mysql vs ndb · dbff1150
      unknown authored
      
      mysql-test/r/ndb_index_ordered.result:
        fix old decimal type mysql vs ndb (re-commit 3)
      mysql-test/t/ndb_index_ordered.test:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/include/ndbapi/NdbDictionary.hpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/include/util/NdbSqlUtil.hpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/src/common/util/NdbSqlUtil.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/src/ndbapi/NdbDictionary.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/src/ndbapi/NdbRecAttr.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/test/include/NdbSchemaOp.hpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/tools/restore/consumer.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      sql/ha_ndbcluster.cc:
        fix old decimal type mysql vs ndb (re-commit 3)
      dbff1150
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 39f5fdeb
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      
      39f5fdeb
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0d4ef3a3
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      0d4ef3a3
    • unknown's avatar
      rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries · 9ffac369
      unknown authored
      
      mysql-test/t/rpl_multi_query.test:
        disable ps-protocol as PS don't support multi-queries
      9ffac369
    • unknown's avatar
      Manual merge · 968e06a8
      unknown authored
      
      mysql-test/t/delete.test:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      968e06a8
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.0 · d6157bec
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
      
      
      d6157bec
    • unknown's avatar
      delete.result, delete.test: · f1a97c0c
      unknown authored
        Added a test case for bug #8392.
      sql_delete.cc:
        Fixed bug #8392.
        The bug caused a crash for a delete statement with ORDER BY
        that explicitly referred to the modified table.
      
      
      sql/sql_delete.cc:
        Fixed bug #8392.
        The bug caused a crash for a delete statement with ORDER BY
        that explicitly referred to the modified table.
      mysql-test/t/delete.test:
        Added a test case for bug #8392.
      mysql-test/r/delete.result:
        Added a test case for bug #8392.
      f1a97c0c
  3. 15 Feb, 2005 14 commits
  4. 14 Feb, 2005 8 commits
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 28b0b451
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      
      28b0b451
    • unknown's avatar
      1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores" · 4cead8c8
      unknown authored
      and fixing it another way (per Monty; a simpler solution which does not increase the number
      of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
      2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
      thd->query_length to the length of the query being executed, not counting the next queries
      if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
      
      
      
      mysql-test/r/drop_temp_table.result:
        back to one single DROP
      sql/sql_base.cc:
        undoing the fix I had made some days ago: we are back to one single DROP TEMPORARY TABLE for all temp tables.
      sql/sql_parse.cc:
        1) set thd->query_length to the length of the query being executed, excluding the other next queries
        if this is a multi-query. The setting happens ASAP, ie. just after we know it's a multi-query, ie. just after yyparse().
        Don't include the ';' in thd->query_length, because this is not good for storage in binlog.
        2) always execute a DROP TEMPORARY TABLE IF EXISTS on slave, don't skip it even if --replicate-ignore-table
      4cead8c8
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 92f55e98
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug8218
      
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      92f55e98
    • unknown's avatar
      Remove redundant DROP TABLE from test case · 4173610b
      unknown authored
      4173610b
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3ca0e28c
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/mysql-4.1
      
      
      3ca0e28c
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4b4c887a
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      4b4c887a
    • unknown's avatar
      Bug#8351 · de3f93c6
      unknown authored
      Fix for crash when using a double quote in boolean fulltext query.
      
      
      mysql-test/r/fulltext.result:
        Added a test case for bug #8351.
      mysql-test/t/fulltext.test:
        Added a test case for bug #8351.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      de3f93c6
    • unknown's avatar
      e2b64801
  5. 13 Feb, 2005 5 commits
    • unknown's avatar
      Bug#2435 · a8d2152f
      unknown authored
        Alter handling for UNION syntax
        Tests for UNION and parentheses
      
      
      mysql-test/r/union.result:
        Bug#2435
          Tests for UNION and parentheses
      mysql-test/t/union.test:
        Bug#2435
          Tests for UNION and parentheses
      sql/sql_yacc.yy:
        Bug#2435
          Amend handling of UNION with parentheses.
      a8d2152f
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.0 · 0d578714
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      innobase/row/row0mysql.c:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      0d578714
    • unknown's avatar
      row0mysql.c: · 4c21a10f
      unknown authored
        Backport the column prefix memory corruption fix from 5.0
      
      
      innobase/row/row0mysql.c:
        Backport the column prefix memory corruption fix from 5.0
      4c21a10f
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 276c90cd
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      
      276c90cd
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 · b7fadca1
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
      
      
      b7fadca1
  6. 12 Feb, 2005 1 commit