1. 23 Jan, 2006 21 commits
  2. 22 Jan, 2006 1 commit
  3. 20 Jan, 2006 18 commits
    • unknown's avatar
      rpl_foreign_key_innodb.result, rpl_foreign_key.test: · 1a6dc148
      unknown authored
        had to add order by
      
      
      mysql-test/extra/rpl_tests/rpl_foreign_key.test:
        had to add order by
      mysql-test/r/rpl_foreign_key_innodb.result:
        had to add order by
      1a6dc148
    • unknown's avatar
      Updated test · e885b1af
      unknown authored
      
      BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38:
        Delete: mysql-test/include/not_ndb_table.inc
      BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a:
        Delete: mysql-test/r/not_ndb_table.require
      mysql-test/extra/rpl_tests/rpl_foreign_key.test:
        Cleanup test for NDB
      mysql-test/t/rpl_foreign_key_innodb.test:
        Cleanup test for NDB
      mysql-test/r/rpl_foreign_key_innodb.result:
        Cleanup test for NDB
      mysql-test/t/rpl_optimize.test:
        setting back to orginal values
      e885b1af
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · fa90abeb
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.1-new
      
      
      fa90abeb
    • unknown's avatar
    • unknown's avatar
      fix for bug#16431 (Events: An event which alters itself disappears) · 3a8e50e0
      unknown authored
      WL#1034 (Internal CRON)
      
      
      mysql-test/r/events.result:
        add a test for to test bug #16431
      mysql-test/t/events.test:
        results of new tests
      sql/event.cc:
        - more debug info
        - pass info to evex_remove_from_cache() whether the operation 
          was drop or alter. this fixes possible bug that may lead to dropping
          of an event when it's altered. also fix for bug#16431
      sql/event_executor.cc:
        be more verbose and throw more errors
      sql/event_timed.cc:
        - add ` around the names of the db and the event_name and not
        their concatenation. remove ; from the end - unneeded. this fixes bug #16431,
        which was failing because after some recursion the query was ending on ;;
        which is normally an error in the parser because that's the delimiter
        
        - more debug info
        - don't execute lex_end() two times when there's a parse error or thd->is_fatal_error
      3a8e50e0
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 61946d22
      unknown authored
      into  selena.:H:/MYSQL/src/#00000-mysql-5.1
      
      
      client/mysqlslap.c:
        Auto merged
      configure.in:
        Auto merged
      VC++Files/mysql.sln:
        manual merge
      61946d22
    • unknown's avatar
      Post review updates for win32 port of mysqlslap · 94ea9883
      unknown authored
      94ea9883
    • unknown's avatar
      fix for bug#16548 (Events: can't alter clause for preserve) · 2dc2a430
      unknown authored
      WL #1034 (Internal CRON)
      
      
      mysql-test/r/events.result:
        fix the results
      mysql-test/t/disabled.def:
        make it enabled
      mysql-test/t/events.test:
        - comment out some tests (having problems now)
        - add test for fix for bug#16548
      sql/sql_yacc.yy:
        - fix for bug#16548 (Events: can't alter clause for preserve)
        - prefix optional non-terminals with opt_
      2dc2a430
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.1-new · b045ee32
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp5.1
      
      
      b045ee32
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 59206da1
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp5.1
      
      
      59206da1
    • unknown's avatar
      option to run mysql-test-run without binlog · ba315e9b
      unknown authored
      calculate ndbcluster slave port
      
      
      mysql-test/mysql-test-run.pl:
        calculate ndbcluster slave port
      mysql-test/mysql-test-run.sh:
        option to run mysql-test-run without binlog
      sql/mysqld.cc:
        option to run mysql-test-run without binlog
      ba315e9b
    • unknown's avatar
      Fix formatting. · 9687e568
      unknown authored
      9687e568
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · f3989fed
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp5.1
      
      
      f3989fed
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.1-new · 3da63810
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp5.1
      
      
      sql/sql_class.cc:
        Auto merged
      3da63810
    • unknown's avatar
      Portability compilation fixes. · e3523a0f
      unknown authored
      
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Fix sol10-amd64-a compile failure, conflict with system headers.
      sql/log.cc:
        Rename macros to fix AIX conflict with system LOG_GENERAL macros.
      sql/mysql_priv.h:
        Rename macros to fix AIX conflict with system LOG_GENERAL macros.
      sql/sql_delete.cc:
        Rename macros to fix AIX conflict with system LOG_GENERAL macros.
      sql/table.cc:
        Rename macros to fix AIX conflict with system LOG_GENERAL macros.
      sql/sql_parse.cc:
        Fix HPUX compile failure, initializing char * with const char *
      e3523a0f
    • unknown's avatar
      Back out errorneous Windows fix. · e4cae610
      unknown authored
      e4cae610
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 72a1ae42
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      72a1ae42
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · cf735347
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      cf735347