1. 28 Feb, 2006 27 commits
    • unknown's avatar
      Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 · c79b12c0
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
      
      
      client/mysqltest.c:
        Auto merged
      c79b12c0
    • unknown's avatar
      mysqltest.c: · e6322ed6
      unknown authored
        Fix typos.
      
      
      client/mysqltest.c:
        Fix typos.
      e6322ed6
    • unknown's avatar
      Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 · 361bc5f0
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      client/mysqltest.c:
        y
        manual merge
      361bc5f0
    • unknown's avatar
      mysqltest.c: · 98ff7cf0
      unknown authored
        Fix typos.
      
      
      client/mysqltest.c:
        Fix typos.
      98ff7cf0
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 02741ee6
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      02741ee6
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3f8bc270
      unknown authored
      into lmy004.:/work/mysql-5.1-bug16537
      
      3f8bc270
    • unknown's avatar
      don't use magic numbers when there are already constants · 07bfc4ae
      unknown authored
      (forgotten to be committed)
      
      07bfc4ae
    • unknown's avatar
      ndb - blob tables vs dict cache : patch 1 · 697044ae
      unknown authored
      
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        blob fix 1: cache no tables at create.
        previously main table was cached before blob tables were ready.
        autoincr fix to avoid caching as side-effect.
        also removes some rename fix where createBlobTables had old/new args.
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        blob fix 1: cache no tables at create.
        previously main table was cached before blob tables were ready.
        autoincr fix to avoid caching as side-effect.
        also removes some rename fix where createBlobTables had old/new args.
      storage/ndb/src/ndbapi/ndberror.c:
        blob fix 1: cache no tables at create.
        previously main table was cached before blob tables were ready.
        autoincr fix to avoid caching as side-effect.
        also removes some rename fix where createBlobTables had old/new args.
      697044ae
    • unknown's avatar
      Updated new tests from Lars review · 514cfd42
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
        Updated from review comments
      mysql-test/include/rpl_multi_engine3.inc:
        Updated from review comments
      514cfd42
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ee7bf38a
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      ee7bf38a
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 487664eb
      unknown authored
      into lmy004.:/work/mysql-5.1-bug16537
      
      487664eb
    • unknown's avatar
      fix for bug#16537 · 995a56ef
      unknown authored
      (post-review pre-push changes)
      coding style (mostly trailing spaces removed)
      
      
      mysql-test/r/events.result:
        fix result file
      sql/event.cc:
        - remove trailing spaces
        - add a missing initializer (gcc warning)
        - C++ to C comments
      sql/event_executor.cc:
        - fix coding style (C++ to C comments, remove trailing spaces)
        - fix wrong indexing buggie not found till now (queue indexing is 0 based,
          not 1 based)
      sql/event_timed.cc:
        - fix coding style
      995a56ef
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 04bdb1b3
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new.16313
      
      04bdb1b3
    • unknown's avatar
      Bug #17499 Alter table of ndb partitioned tables causes mysqld to core · 5733d916
      unknown authored
      - moved used_partitions initialization
      
      5733d916
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1bdbd7f5
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      1bdbd7f5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f0c1702b
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      f0c1702b
    • unknown's avatar
      Windows compile fixes. · ce406dee
      unknown authored
      
      VC++Files/sql/mysqld.vcproj:
        Add missing source file.
      ce406dee
    • unknown's avatar
      Windows compile fixes. · 4068c3c6
      unknown authored
      
      win/cmakefiles/mysys:
        Remove no longer existing source file from list.
      sql/log_event.cc:
        Fix byte * <-> char * Windows build problem.
      VC++Files/mysys/mysys.vcproj:
        Remove no longer existing source file from list.
      4068c3c6
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 040d2566
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      040d2566
    • unknown's avatar
      Bug #17701, ALTER TABLE t1 ADD PARTITION for PARTITION BY LIST hangs test · f16211c1
      unknown authored
      - code wrongly tries to do a "fast alter partition", although not supported
      
      
      sql/handler.h:
        moved defines
      sql/sql_partition.h:
        moved defines
      f16211c1
    • unknown's avatar
      Bug#16385, Partitions: crash when updating a range partitioned NDB table · e7e8e574
      unknown authored
      - too little space was allocated for receiving events, partition uses extra column in table
      
      
      mysql-test/r/ndb_partition_range.result:
        Bug#16385, Partitions: crash when updating a range partitioned NDB table
      mysql-test/t/ndb_partition_range.test:
        Bug#16385, Partitions: crash when updating a range partitioned NDB table
      e7e8e574
    • unknown's avatar
      Bug #17763 mysqld cores with list partitioning if update to missing partition · d6e2cc1a
      unknown authored
      - error string wrongly formatted
      
      
      mysql-test/r/ndb_partition_error.result:
        Bug #17763 mysqld cores with list partitioning if update to missing partition
      mysql-test/t/ndb_partition_error.test:
        Bug #17763 mysqld cores with list partitioning if update to missing partition
      d6e2cc1a
    • unknown's avatar
      manual merge · 29c1d31c
      unknown authored
      
      mysql-test/r/events.result:
        Auto merged
      mysql-test/t/events.test:
        Auto merged
      sql/event.cc:
        Auto merged
      sql/event.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      29c1d31c
    • unknown's avatar
      fix for bug#16537 (Events: mysql.event.starts is null) · c70ad8d8
      unknown authored
      - now when the event is created and STARTS is omitted then STARTS is implicitly
        CURRENT_TIMESTAMP
      - This CS also fixed incorrect presentation of STARTS/ENDS in I_S.EVENTS
      (incorporated review changes)
      
      
      mysql-test/r/events.result:
        results of new test cases
      mysql-test/t/events.test:
        new test cases for bug #16537 (Events: mysql.event.starts is null)
      sql/event.cc:
        - check whether event_timed::starts_null only in case
          event_timed::expression is set, so for recurring events only
        - disable binlogging of CREATE EVENT statement. It should not be
          replicated but the result of the execution. Still the replication is
          untouched topic.
      sql/event.h:
        - add flags whether starts, ends and execute_at are null or not
      sql/event_executor.cc:
        - check whether xxx_null instead of !xxxx.year
      sql/event_timed.cc:
        - introduce xxx_null and change the usage of xxx.year to !xxx_null
      sql/sql_show.cc:
        - don't show 0000-00-00 in I_S.EVENTS when the value is NULL
      sql/sql_yacc.yy:
        - if STARTS is omitted default to current_timestamp
      c70ad8d8
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 8ff5ed9b
      unknown authored
      into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
      
      8ff5ed9b
    • unknown's avatar
      Bug#16313 XML: extractvalue() ignores '!' in names · 1cb4810a
      unknown authored
      xml.result, xml.test:
        Adding test case.
      item_xmlfunc.cc:
        Fixed that the "!" character written at the end was ignored.
      
        Now if we try to scan "!=", and if "!" is not
        followed by "=", we rollback lex scanner back 
        to "!" token, so the parser will start to check
        the next rule from the "!" character again.
      
        Previously parser started from the next character,
        which was EOF in the example in xml.test,
        which led to query being successfully parsed,
        instead of producing a syntax error.
      
      
      sql/item_xmlfunc.cc:
        Bug#16313 XML: extractvalue() ignores '!' in names
        '!' at the end was ignored.
        Now if we try to scan "!=", and if "!" is not
        followed by "=", we rollback lex scanner back 
        to "!" token, so the parser will start to check
        the next rule from the "!" character again.
        Previously it started from the next character,
        which was EOF in the example in xml.test, and
        which led to query being successfully parsed,
        instead of producing a syntax error.
      mysql-test/t/xml.test:
        Adding test case.
      mysql-test/r/xml.result:
        Adding test case.
      1cb4810a
    • unknown's avatar
      Fixed crashes in embedded-server tests · 5d05a82d
      unknown authored
      
      sql/sql_class.cc:
        fixed code caused superfluous protocol->remove_last_row() call
      5d05a82d
  2. 27 Feb, 2006 13 commits