1. 10 Mar, 2006 6 commits
  2. 09 Mar, 2006 34 commits
    • unknown's avatar
      Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new · a2498602
      unknown authored
      into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/t/mysqldump.test:
        Auto merged
      a2498602
    • unknown's avatar
      Added code to mysqldump to dump timed events when instructed to do so, with · 38407743
      unknown authored
      the '-E' or '--events' flag.  (Closes Bug#16853 and Bug#17714.)
      
      
      WARNING:
      
      At present, these tests fail due to b*g number 18078.
      
      
      client/mysqldump.c:
        Added code to dump events, when asked to do so via the --events parameter.
        
        Also cleaned up some surrounding code.
      mysql-test/r/mysqldump.result:
        Added a test to create an event, dump it, restore it, add more events, dump
        all of them, and restore all of them.
      mysql-test/t/mysqldump.test:
        Added a test to create an event, dump it, restore it, add more events, dump
        all of them, and restore all of them.
      sql/event_timed.cc:
        No longer qualify SHOW CREATE EVENT names with the database name.
      BitKeeper/etc/ignore:
        Removing accidentally 'ignored' bogus file entry.
      38407743
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f8e16cfb
      unknown authored
      into sunlight.local:/work_local/17726-bug-5.1-new-mysql
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      f8e16cfb
    • unknown's avatar
      Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 · 6e750f1f
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
      
      
      mysql-test/t/mysqltest.test:
        Auto merged
      6e750f1f
    • unknown's avatar
      mysqltest.test: · 2fbd1777
      unknown authored
        Fix typos.
      
      
      mysql-test/t/mysqltest.test:
        Fix typos.
      2fbd1777
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 823a630c
      unknown authored
      into  zim.(none):/home/mikael/bug17947
      
      
      823a630c
    • unknown's avatar
      Merge zim.(none):/home/brian/mysql/mysql-5.0 · 4f3a18d5
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.1-new
      
      
      configure.in:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      4f3a18d5
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e8f1b6d9
      unknown authored
      into  zim.(none):/home/mikael/bug17947
      
      
      sql/sql_yacc.yy:
        Auto merged
      e8f1b6d9
    • unknown's avatar
      BUG#17947: Crash when REBUILD PARTITION syntax error · 1d9a1c46
      unknown authored
      
      mysql-test/r/partition.result:
        New test case
      mysql-test/t/partition.test:
        New test case
      sql/sql_yacc.yy:
        Ridiculuos small bug in parser
      1d9a1c46
    • unknown's avatar
      Merge moonbone.local:/work/17726-bug-5.0-mysql · 71c538ee
      unknown authored
      into moonbone.local:/work/17726-bug-5.1-new-mysql
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      71c538ee
    • unknown's avatar
      Porting fix that allows others to include compiled code with different parsers. · 85d705b6
      unknown authored
      Makes you wonder what I am up to, doesn't?
      
      
      configure.in:
        Adjusts bison to not create symbols that clash.
      sql/sql_analyse.cc:
        Adding define to make sure sql_yacc.h gets included.
      sql/sql_lex.cc:
        Fixing it so that sql_yacc.h is included
      sql/sql_lex.h:
        Fixing include rules
      sql/sql_parse.cc:
        Adding flag to compile sql_yacc.yy
      85d705b6
    • unknown's avatar
      After-merge fixes. · fe0b818f
      unknown authored
      
      mysql-test/r/trigger-grant.result:
        Updated the result file.
      mysql-test/r/view_grant.result:
        Updated the result file.
      mysql-test/t/trigger-grant.test:
        A patch for BUG#13198 has been merged, so need to update the test case.
      mysql-test/t/view_grant.test:
        A patch for BUG#16777 has been merged, so need to update the test case.
      sql/sql_parse.cc:
        After-merge fix (should have been a part of fix for BUG#16777).
      sql/sql_show.cc:
        After-merge fix -- empty identifier should be quoted.
      fe0b818f
    • unknown's avatar
      Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree · 99b9f7a4
      unknown authored
      into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/rpl_ddl.result:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Auto merged
      mysql-test/r/rpl_trigger.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/sql_mode.result:
        Auto merged
      mysql-test/t/rpl_trigger.test:
        Auto merged
      mysql-test/t/skip_grants.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      mysql-test/lib/mtr_cases.pl:
        Manually merged.
      sql/sp.cc:
        Manually merged.
      sql/sql_yacc.yy:
        Manually merged.
      99b9f7a4
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4c880561
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      4c880561
    • unknown's avatar
      Cleanup · 0f771ef2
      unknown authored
      
      mysql-test/t/disabled.def:
        Orginize file order
      0f771ef2
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 87a27026
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      87a27026
    • unknown's avatar
      ndb - bug#18067 bug#18075 closes these bugs · 9f573182
      unknown authored
      
      mysql-test/r/rpl_ndb_blob.result:
        test case for varsize PK + blob
      mysql-test/t/rpl_ndb_blob.test:
        test case for varsize PK + blob
      storage/ndb/include/ndbapi/NdbBlob.hpp:
        table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK
      9f573182
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b5fdd201
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      
      b5fdd201
    • unknown's avatar
      rpl_ndb_dd_advance.result: · 26e76562
      unknown authored
        Updated results
      rpl_ndb_dd_advance.test:
        Updated test case from comments in Tomas's review
        Changes bug number comment
      
      
      mysql-test/t/rpl_ndb_dd_advance.test:
        Updated test case from comments in Tomas's review
      mysql-test/r/rpl_ndb_dd_advance.result:
        Updated results
      26e76562
    • unknown's avatar
      ndb - bug#18067 [possibly partial] fix · 1cef1679
      unknown authored
      
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        split pk: over-eager assert in varsize PK case
      1cef1679
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e86ea27b
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      e86ea27b
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · cabebacd
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      cabebacd
    • unknown's avatar
      Bug #18106 Ndb: Online add index together with replication may cause mysqld core · 63aba707
      unknown authored
      
      sql/ha_ndbcluster_binlog.cc:
        Bug #18106  	Ndb: Online add index together with replication may cause mysqld core
        - move initialization of Ndb share ndb_values from ndbcluster_binlog_open_table to
          ndbcluster_binlog_init_share so that ndbcluster_binlog_open_table can be used for reinitializing
          after frm change
        - free table share on remote mysqld on online alter (call ndbcluster_binlog_close_table)
        - free share before calling ndb_create_table_from_engine to be able to handle trailing share correctly
        + debug printouts
        + extra nulling of some variables
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Bug #18106  	Ndb: Online add index together with replication may cause mysqld core
        - reinitialize event operation rec attrs after online schema change
      63aba707
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · cc736560
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      cc736560
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5fc1fd87
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      5fc1fd87
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d56ca9c7
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      d56ca9c7
    • unknown's avatar
      bug#18040: Create unique index cause error 4243 · a52a5923
      unknown authored
      a52a5923
    • unknown's avatar
      Merge mysql.com:/space/pekka/ndb/version/my51 · 1c6d4a8e
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51-dict
      
      
      1c6d4a8e
    • unknown's avatar
      ndb - fix bug#18075 varsize PK + blobs · 7f86cede
      unknown authored
      
      storage/ndb/include/ndbapi/NdbBlob.hpp:
        fast fix bug#18075
      storage/ndb/include/ndbapi/NdbOperation.hpp:
        fast fix bug#18075
      storage/ndb/include/ndbapi/NdbScanOperation.hpp:
        fast fix bug#18075
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        fast fix bug#18075
      storage/ndb/src/ndbapi/NdbBlobImpl.hpp:
        fast fix bug#18075
      storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
        fast fix bug#18075
      storage/ndb/src/ndbapi/NdbRecAttr.cpp:
        fast fix bug#18075
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        fast fix bug#18075
      storage/ndb/src/ndbapi/ndberror.c:
        fast fix bug#18075
      storage/ndb/test/ndbapi/testBlobs.cpp:
        fast fix bug#18075
      7f86cede
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5e54b63f
      unknown authored
      into moonbone.local:/work/17726-bug-5.0-mysql
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      5e54b63f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 73238e55
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
      
      
      73238e55
    • unknown's avatar
      Make test case run only for statement logging · c1f75404
      unknown authored
      
      mysql-test/t/rpl_trunc_temp.test:
        Test case only works with statement logging
      c1f75404
    • unknown's avatar
      missing DBUG_RETURN added · 1fa143cc
      unknown authored
      1fa143cc
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new/ · 41a86383
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new.b16318
      
      
      sql/item_xmlfunc.cc:
        Auto merged
      mysql-test/r/xml.result:
        After merge fix
      mysql-test/t/xml.test:
        After merge fix
      41a86383