1. 28 Feb, 2006 22 commits
    • unknown's avatar
      class event_timed -> Event_timed · 58a6d96c
      unknown authored
      fix for bug#17793 (Scheduler uses class event_timed should be Event_timed)
      
      
      sql/event.cc:
        class event_timed -> Event_timed
      sql/event.h:
        class event_timed -> Event_timed
      sql/event_executor.cc:
        class event_timed -> Event_timed
      sql/event_priv.h:
        class event_timed -> Event_timed
      sql/event_timed.cc:
        class event_timed -> Event_timed
      sql/sql_lex.h:
        class event_timed -> Event_timed
      sql/sql_show.cc:
        class event_timed -> Event_timed
      sql/sql_yacc.yy:
        class event_timed -> Event_timed
      58a6d96c
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0c4ef915
      unknown authored
      into lmy004.:/work/mysql-5.1-bug16537
      
      
      0c4ef915
    • unknown's avatar
      don't use magic numbers when there are already constants · 9a720dfa
      unknown authored
      (forgotten to be committed)
      
      
      9a720dfa
    • unknown's avatar
      Updated new tests from Lars review · c6d8d3ea
      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
      c6d8d3ea
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4e58be10
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      
      4e58be10
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 79298b3e
      unknown authored
      into lmy004.:/work/mysql-5.1-bug16537
      
      
      79298b3e
    • unknown's avatar
      fix for bug#16537 · b934539d
      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
      b934539d
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7f7c6246
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new.16313
      
      
      7f7c6246
    • unknown's avatar
      Bug #17499 Alter table of ndb partitioned tables causes mysqld to core · 50ce511b
      unknown authored
      - moved used_partitions initialization
      
      
      50ce511b
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b203771e
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      b203771e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 447c6aa3
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      447c6aa3
    • unknown's avatar
      Windows compile fixes. · 208e6c5f
      unknown authored
      
      VC++Files/sql/mysqld.vcproj:
        Add missing source file.
      208e6c5f
    • unknown's avatar
      Windows compile fixes. · 37062786
      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.
      37062786
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 029f16a1
      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
      029f16a1
    • unknown's avatar
      Bug #17701, ALTER TABLE t1 ADD PARTITION for PARTITION BY LIST hangs test · 46fc7653
      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
      46fc7653
    • unknown's avatar
      Bug#16385, Partitions: crash when updating a range partitioned NDB table · 5f06d173
      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
      5f06d173
    • unknown's avatar
      Bug #17763 mysqld cores with list partitioning if update to missing partition · ad5eb8d1
      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
      ad5eb8d1
    • unknown's avatar
      manual merge · f6f52921
      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
      f6f52921
    • unknown's avatar
      fix for bug#16537 (Events: mysql.event.starts is null) · 317c6851
      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
      317c6851
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 00de3c04
      unknown authored
      into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
      
      
      00de3c04
    • unknown's avatar
      Bug#16313 XML: extractvalue() ignores '!' in names · 828de833
      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.
      828de833
    • unknown's avatar
      Fixed crashes in embedded-server tests · de7ac129
      unknown authored
      
      sql/sql_class.cc:
        fixed code caused superfluous protocol->remove_last_row() call
      de7ac129
  2. 27 Feb, 2006 18 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 10080bb1
      unknown authored
      into  zim.(none):/home/brian/mysql/dep-5.1
      
      
      10080bb1
    • unknown's avatar
      another cleanup patch for removing tables before tests start. · f78d0531
      unknown authored
      
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Fixing isssues with preexisting tables
      mysql-test/r/binlog_stm_insert_select.result:
        new results
      f78d0531
    • unknown's avatar
      Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 · b6c3c726
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
      
      
      mysql-test/t/trigger.test:
        Auto merged
      b6c3c726
    • unknown's avatar
      Fix for trigger.test failures on pushbuild hosts introduced by fix for · 2efabfd1
      unknown authored
      bug #13525 "Rename table does not keep info of triggers".
      
      Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
      vardir. Also improved cleanup after the test.
      
      
      mysql-test/t/trigger.test:
        Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
        vardir. Also improved cleanup after the test.
      2efabfd1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 13b4ee92
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
      
      
      sql/sql_base.cc:
        Auto merged
      13b4ee92
    • unknown's avatar
      Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 · e54ecf09
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
      
      
      client/mysqltest.c:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/myisammrg/myrg_queue.c:
        Auto merged
      sql/sql_rename.cc:
        Manual merge.
      sql/sql_trigger.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge.
      e54ecf09
    • unknown's avatar
      Fixed test results after bad auto-merge. · 475eb3e9
      unknown authored
      475eb3e9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c7fc3773
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
      
      
      c7fc3773
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6e7d47e2
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
      
      
      sql/field.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_select.h:
        Manual merge.
      6e7d47e2
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0aae3cd5
      unknown authored
      into  selena.:H:/MYSQL/src/#15943-mysql-5.0
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      0aae3cd5
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · a431e912
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug17314-push
      
      
      a431e912
    • unknown's avatar
      BUG#17499, forgot to commit result file · b697993a
      unknown authored
      b697993a
    • unknown's avatar
      Post-merge fixes. · 594ba86b
      unknown authored
      
      sql/ha_ndbcluster_binlog.cc:
        Correcting use of bad variable in merge.
      sql/sql_base.cc:
        Removing assertion check for mutex in table share.
      594ba86b
    • unknown's avatar
      Bug #17499 Alter table of ndb partitioned tables causes mysqld to core · bb294c45
      unknown authored
      
      sql/sql_table.cc:
        Bug #17499  	Alter table of ndb partitioned tables causes mysqld to core
        - used_partitions not set during copy of data
      bb294c45
    • unknown's avatar
      New test case fro replication between ndb and other storage engines. · f8bc9b3c
      unknown authored
      
      mysql-test/t/rpl_ndb_2innodb.test:
        New rpl ndb test case for replicating to other storage engines
      mysql-test/t/rpl_ndb_2myisam.test:
        New rpl ndb test case for replicating to other storage engines
      mysql-test/t/rpl_ndb_2innodb-slave.opt:
        New rpl ndb test supporting option files
      mysql-test/t/rpl_ndb_2innodb-master.opt:
        New rpl ndb test supporting option files
      mysql-test/t/rpl_ndb_2myisam-master.opt:
        New rpl ndb test supporting option files
      mysql-test/t/rpl_ndb_2myisam-slave.opt:
        New rpl ndb test supporting option files
      mysql-test/t/rpl_ndb_innodb2ndb.test:
        New rpl ndb test case for replicating from other storage engines to ndb
      mysql-test/t/rpl_ndb_myisam2ndb.test:
        New rpl ndb test case for replicating from other storage engines to ndb
      mysql-test/t/rpl_ndb_innodb2ndb-master.opt:
        New rpl ndb test supporting option files
      mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
        New rpl ndb test supporting option files
      mysql-test/t/rpl_ndb_myisam2ndb-master.opt:
        New rpl ndb test supporting option files
      mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
        New rpl ndb test supporting option files
      mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
        New test code that drives the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
      mysql-test/include/rpl_multi_engine3.inc:
        New include that cover repeating code of the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
      mysql-test/t/disabled.def:
        Updated to include new test cases that have outstanding bug reports.
      f8bc9b3c
    • unknown's avatar
    • unknown's avatar
      Bug#17716 Slave crash in net_clear on qnx · b97082c5
      unknown authored
       - Set FD_SETSIZE before including "sys/select.h"
      
      
      include/my_global.h:
        Define FD_SETSIZE on QNX before including "sys/select.h" or "sys/time.h". This defines number of bits in fd_set type used for 'select'
      b97082c5
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · f37f4b01
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug17314
      
      
      f37f4b01