1. 12 Jan, 2006 3 commits
    • unknown's avatar
      Added bitfield support and a test for it. · a549befb
      unknown authored
      Archive uses native row format, so honestly this is just the change in a flag. 
      
      
      sql/ha_archive.h:
        Added bit field support (and dropped the ha_not_exact_count since we always have this).
      mysql-test/r/archive_bitfield.result:
        New BitKeeper file ``mysql-test/r/archive_bitfield.result''
      mysql-test/t/archive_bitfield.test:
        New BitKeeper file ``mysql-test/t/archive_bitfield.test''
      a549befb
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3c5c5c37
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-5.1
      
      
      3c5c5c37
    • unknown's avatar
      delete the stale file and this should fix the build · 4ee6e77f
      unknown authored
      after my push of WL#1034 (Internal CRON) into 5.1
      
      
      BitKeeper/deleted/.del-event.h~2c9fb599ae4e39e7:
        Delete: libmysqld/event.h
      4ee6e77f
  2. 11 Jan, 2006 34 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 09d2e055
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-5.1
      
      
      09d2e055
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9dc0942a
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      9dc0942a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0966a189
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      0966a189
    • unknown's avatar
      bug: replication of table spaces to work · 45a4daa4
      unknown authored
      bug: check if storage engine is enabled to avoif code dump
      
      
      BitKeeper/etc/ignore:
        Added storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate storage/ndb/test/ndbapi/ndbapi_slow_select storage/ndb/test/ndbapi/testBitfield storage/ndb/test/ndbapi/testLcp storage/ndb/test/ndbapi/testPartitioning storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/tools/listen_event to the ignore list
      45a4daa4
    • unknown's avatar
      WL #1034 · af6d4026
      unknown authored
      - add a bit more debug messages
      - disable events.test for now due to a bug
      
      
      mysql-test/r/events.result:
        fix result
      mysql-test/t/disabled.def:
        make it disabled
      mysql-test/t/events.test:
        disable show processlist
      sql/event_executor.cc:
        a bit more debug messages
      af6d4026
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7355e7d5
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      
      7355e7d5
    • unknown's avatar
      Changes done from Jonas's review of pervious commit · bbed1ba9
      unknown authored
      
      mysql-test/t/ndb_dd_basic.test:
        Changed test.t1 back to t1 per Jonas's review
      mysql-test/r/ndb_dd_basic.result:
        Changed test.t1 back to t1 per Jonas's review
      bbed1ba9
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 21d71ab5
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-5.1
      
      
      21d71ab5
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1e3dfe04
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      1e3dfe04
    • unknown's avatar
      WL #1034 (Internal CRON) pre-push updates · 2fc956fa
      unknown authored
      - various fixes of test cases
      (hopefully the last pre-push update before the push)
      
      
      mysql-test/include/system_db_struct.inc:
        extend test case to include testing for event system table
      mysql-test/r/events.result:
        results of events test
      mysql-test/r/system_mysql_db.result:
        more testing - add structure of event system table
      mysql-test/t/events.test:
        test case for events (internal CRON)
      mysql-test/t/system_mysql_db_fix.test:
        drop event table and leave the test database empty
      scripts/mysql_create_system_tables.sh:
        add missing create table statement
      scripts/mysql_fix_privilege_tables.sql:
        don't specify the database. this fixes a failing test case which creates the
        tables not on mysql but on a test database and then tests again mysql.
      sql/event_executor.cc:
        if asked to stop -> stop.
      2fc956fa
    • unknown's avatar
      Test clean up and moving over from old clone. · 0c64879d
      unknown authored
      
      mysql-test/t/ndb_dd_basic.test:
        Rename: mysql-test/t/ndb_basic_disk.test -> mysql-test/t/ndb_dd_basic.test
      mysql-test/r/ndb_dd_basic.result:
        Rename: mysql-test/r/ndb_basic_disk.result -> mysql-test/r/ndb_dd_basic.result
      mysql-test/t/ndb_dd_ddl.test:
        New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
      mysql-test/r/ndb_dd_ddl.result:
        New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
      0c64879d
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new · db122ce4
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
      
      
      db122ce4
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8d1ea9e2
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      8d1ea9e2
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f59bbb4f
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/warnings/mysql-5.1-new
      
      
      f59bbb4f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 012cd81b
      unknown authored
      into  mysql.com:/usr/local/mysql/tmpbuild2
      
      
      012cd81b
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new · bfa11000
      unknown authored
      into  mysql.com:/home/bkroot/mysql-5.1-new
      
      
      bfa11000
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · ca5f5594
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.1-new
      
      
      ca5f5594
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 51b3a1d1
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup
      
      
      51b3a1d1
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a66eafd6
      unknown authored
      into lmy004.:/work/mysql-5.1-tt-copy-works
      
      
      sql/sql_show.cc:
        Auto merged
      a66eafd6
    • unknown's avatar
      WL #1034 (Internal CRON) pre-push fixes · b8ce8ad1
      unknown authored
      after another merge fixes.
      
      
      mysql-test/r/information_schema.result:
        WL #1034 (Internal CRON)
        fix result
      mysql-test/r/mysqlcheck.result:
        WL #1034 (Internal CRON)
        fix result
      mysql-test/r/sp.result:
        WL #1034 (Internal CRON)
        fix result
      sql/event.cc:
        after fixes for WL1012 fix these to be able to compile
      sql/event_timed.cc:
        after fixes for WL1012 fix these to be able to compile
      sql/share/errmsg.txt:
        readd error messages removed during manual update
      sql/sql_yacc.yy:
        fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
        merge. The merge wasn't good :(
      b8ce8ad1
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e4415012
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.1-new
      
      
      e4415012
    • unknown's avatar
      5c4a94b9
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2769f0dc
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.1-new
      
      
      2769f0dc
    • unknown's avatar
      Additional fix for wl#2506 · 5df64b26
      unknown authored
      
      mysql-test/extra/binlog_tests/ctype_cp932.test:
          fixed test case
      mysql-test/r/binlog_stm_ctype_cp932.result:
          fixed test result
      mysql-test/t/ctype_ucs.test:
          fixed test case
      sql/sql_show.cc:
         Compilation with disabled partitioning is fixed
      5df64b26
    • unknown's avatar
      manual merge · 0d732a14
      unknown authored
      
      sql/Makefile.am:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      0d732a14
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.1-new · a64008e1
      unknown authored
      into  mysql.com:/home/bk/b16095-mysql-5.1-new
      
      
      a64008e1
    • unknown's avatar
      wl2723 - ndb opt. nr · 641ce5e9
      unknown authored
      
      mysql-test/t/rpl_multi_engine.test:
        merge fix
      libmysqld/sql_tablespace.cc:
        New BitKeeper file ``libmysqld/sql_tablespace.cc''
      mysql-test/r/ndb_basic_disk.result:
        New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
      mysql-test/t/ndb_basic_disk.test:
        New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
      sql/sql_tablespace.cc:
        New BitKeeper file ``sql/sql_tablespace.cc''
      storage/ndb/src/kernel/blocks/OptNR.txt:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
      storage/ndb/src/kernel/vm/mem.txt:
        New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
      storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
      storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
      storage/ndb/tools/ndb_error_reporter:
        New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''
      641ce5e9
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup · ecd1229a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      ecd1229a
    • unknown's avatar
      Add comments that groups and describes the inits · 113290fe
      unknown authored
      
      client/mysqltest.c:
        Add comments
        Group inits logically
      113290fe
    • unknown's avatar
      Remove obsolete comment · c5451d02
      unknown authored
      c5451d02
    • unknown's avatar
      Fix problem with strange printout of line numbers, detected on aix52, but... · b5fb52dc
      unknown authored
      Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
      
      
      client/mysqltest.c:
        Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
      mysql-test/r/mysqltest.result:
        Correct test result, "At line 1" should be printed
      b5fb52dc
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix · 53212ec5
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.1-new
      
      
      storage/ndb/src/common/portlib/Makefile.am:
        Auto merged
      BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
        Auto merged
      storage/ndb/config/common.mk.am:
        Manual merge.
      53212ec5
    • unknown's avatar
      Bug#16095 (INSERT DELAYED crashes mysqld server): · 4cacc367
      unknown authored
        Checking that binlog is open before calling binlog_query().
      
      
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change caused by test change.
      mysql-test/t/rpl_row_basic_11bugs.test:
        Ignoring format event since it contain the version number.
      sql/sql_insert.cc:
        Debriding code.
        Checking that binlog is open before calling binlog_query().
      4cacc367
    • unknown's avatar
      Added support for CREATE TABLE AUTO_INCREMENT and added more tests. Also... · a9d9054a
      unknown authored
      Added support for CREATE TABLE AUTO_INCREMENT and added more tests. Also non-unique index scans of autoincrement not function.
      
      
      mysql-test/r/archive.result:
        New Result file.
      mysql-test/t/archive.test:
        New tests. Modifies old style 0 to NULL.
      sql/ha_archive.cc:
        Added support for scanning non unique indexes. Added support for the AUTO_INCREMENT bit for CREATE TABLE
      sql/ha_archive.h:
        Added variables for continueing scans of index_next
      a9d9054a
  3. 10 Jan, 2006 3 commits