1. 22 Sep, 2005 2 commits
  2. 21 Sep, 2005 6 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 02fe27b3
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      02fe27b3
    • unknown's avatar
      bug#12950 · 3c8a296f
      unknown authored
          ndb backup with charsets and simultanious updates
          make sure that backup _dont_ read xfrm data
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Backup can do dirty read
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Fix so that backup dont read xfrm data
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        Fix so that backup dont read xfrm data
      3c8a296f
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1c2cb842
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      sql/mysqld.cc:
        Auto merged
      1c2cb842
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 98bbb1ae
      unknown authored
      into  mysql.com:/usr/home/ram/work/4.1.b7589
      
      
      98bbb1ae
    • unknown's avatar
      a fix (bug #7589: Decimal types are ignored when updating data from another column). · 24922a30
      unknown authored
      
      mysql-test/r/union.result:
        a fix (bug #7589: Decimal types are ignored when updating data from another column).
        removed wrong test result (see #13372)
      mysql-test/t/union.test:
        a fix (bug #7589: Decimal types are ignored when updating data from another column).
        removed wrong test result (see #13372)
      sql/field_conv.cc:
        a fix (bug #7589: Decimal types are ignored when updating data from another column).
        use memcpy() only for identical decimals.
      24922a30
    • unknown's avatar
      Don't add all args to mysqltest to MYSQL_TEST env var · 30681cf5
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.
      30681cf5
  3. 20 Sep, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/home/psergey/bk-trees/mysql-4.1 · 458a4234
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
      
      
      sql/mysqld.cc:
        Auto merged
      458a4234
    • unknown's avatar
      BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index · a2a8216b
      unknown authored
      statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
      
      
      include/myisam.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/mi_check.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/myisamchk.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/r/myisam.result:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/t/myisam.test:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/ha_myisam.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/handler.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/mysqld.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/set_var.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/sql_class.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      a2a8216b
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1818ff1c
      unknown authored
      into  selena.:H:/MYSQL/src/#12929-mysql-4.1
      
      
      include/my_sys.h:
        Auto merged
      1818ff1c
    • unknown's avatar
      ac604f71
    • unknown's avatar
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7aad3ae6
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      7aad3ae6
  4. 19 Sep, 2005 11 commits
  5. 18 Sep, 2005 4 commits
  6. 17 Sep, 2005 1 commit
  7. 16 Sep, 2005 3 commits
    • unknown's avatar
      mysql-test-run.pl: · d6afdcb7
      unknown authored
        Enabled --valgrind to work (bug#13280)
      
      
      mysql-test/mysql-test-run.pl:
        Enabled --valgrind to work (bug#13280)
      d6afdcb7
    • unknown's avatar
      ndb · d0eb3e28
      unknown authored
        remove extra ";" from test programs
      
      
      ndb/test/include/NDBT_Test.hpp:
        Remove extra ";"
      ndb/test/ndbapi/bank/BankLoad.cpp:
        Remove extra ";"
      ndb/test/ndbapi/testOIBasic.cpp:
        Remove extra ";"
      ndb/test/src/HugoCalculator.cpp:
        Remove extra ";"
      ndb/test/src/NDBT_Test.cpp:
        Remove extra ";"
      ndb/test/src/NdbBackup.cpp:
        Remove extra ";"
      ndb/test/src/NdbRestarts.cpp:
        Remove extra ";"
      d0eb3e28
    • unknown's avatar
      ndb · 97956339
      unknown authored
        impl support for querying resource usage in ndb api
        to help track down mem leaks
      
      
      ndb/include/ndbapi/Ndb.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbBlob.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbConnection.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbIndexOperation.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbOperation.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/include/ndbapi/NdbRecAttr.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbApiSignal.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbApiSignal.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbBlob.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbImpl.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbRecAttr.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbUtil.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/NdbUtil.hpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/Ndbif.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/Ndbinit.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/src/ndbapi/Ndblist.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      ndb/tools/restore/Restore.cpp:
        Impl. reporting of free list usage
        Put free list into handler class
      97956339
  8. 15 Sep, 2005 7 commits
    • unknown's avatar
      Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating · 627bf43d
      unknown authored
      a restriction to 255 chars for editable buffer.
      
      
      VC++Files/mysys/mysys.dsp:
        Added my_conio.c
      VC++Files/mysys/mysys_ia64.dsp:
        Added my_conio.c
      include/my_sys.h:
        Added declarations for my_conio.c functions
      mysys/my_conio.c:
        Added _cgets() replacement that is not limited to 255 chars retrieval
        from win32 console.
      627bf43d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 2a5505c7
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      2a5505c7
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4805236e
      unknown authored
      into moonbone.local:/work/12887-bug-4.1-mysql
      
      
      4805236e
    • unknown's avatar
      Fix bug#12887 Distinct is not always applied after rollup · 36d163d6
      unknown authored
      For queries with GROUP BY and without hidden GROUP BY fields DISTINCT is
      optimized away becuase such queries produce result set without duplicates.
      But ROLLUP can add rows which may be same to some rows and this fact was
      ignored.
      
      Added check so if ROLLUP is present DISTINCT can't be optimized away.
      
      
      sql/sql_select.cc:
        Fix bug #12887 Distinct is not always applied after rollup
      mysql-test/r/olap.result:
        Test case for bug #12887 Distinct is not always applied after rollup
      mysql-test/t/olap.test:
        Test case for bug #12887 Distinct is not always applied after rollup
      36d163d6
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12723 · 1600ee94
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      vio/viosocket.c:
        Auto merged
      1600ee94
    • unknown's avatar
      Turn off EOLN_NATIVE flag of some test files · c11974e6
      unknown authored
      
      mysql-test/r/analyze.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/create_select_tmp.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/flush_block_commit.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/flush_table.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/have_moscow_leap_timezone.require:
        Turn off EOLN_NATIVE flag
      mysql-test/r/have_outfile.require:
        Turn off EOLN_NATIVE flag
      mysql-test/r/innodb-lock.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/lock_multi.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_commit_after_flush.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_drop.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_free_items.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_multi_delete2.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_multi_update.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_multi_update2.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_server_id1.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_server_id2.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_set_charset.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_start_stop_slave.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/timezone3.result:
        Turn off EOLN_NATIVE flag
      c11974e6
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.0 · f6da85f4
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106:
        Auto merged
      BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14:
        Auto merged
      BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838:
        Auto merged
      BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72:
        Auto merged
      BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
        Auto merged
      BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585:
        Auto merged
      BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001:
        Auto merged
      BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9:
        Auto merged
      BitKeeper/deleted/.del-query_cache_notembedded.test:
        Auto merged
      BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87:
        Auto merged
      mysql-test/t/analyze.test:
        Auto merged
      mysql-test/t/ansi.test:
        Auto merged
      mysql-test/t/backup-master.sh:
        Auto merged
      mysql-test/t/bdb-alter-table-2-master.opt:
        Auto merged
      mysql-test/t/bdb-deadlock.test:
        Auto merged
      mysql-test/t/bdb_cache-master.opt:
        Auto merged
      mysql-test/t/bdb_cache.test:
        Auto merged
      mysql-test/t/bool.test:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/constraints.test:
        Auto merged
      mysql-test/t/create_select_tmp.test:
        Auto merged
      mysql-test/t/ctype_cp1251.test:
        Auto merged
      mysql-test/t/ctype_latin1_de-master.opt:
        Auto merged
      mysql-test/t/ctype_latin1_de.test:
        Auto merged
      mysql-test/t/ctype_tis620.test:
        Auto merged
      mysql-test/t/ctype_ujis.test:
        Auto merged
      mysql-test/t/drop_temp_table.test:
        Auto merged
      mysql-test/t/func_concat.test:
        Auto merged
      mysql-test/t/func_encrypt-master.opt:
        Auto merged
      mysql-test/t/flush_block_commit.test:
        Auto merged
      mysql-test/t/func_if.test:
        Auto merged
      mysql-test/t/func_isnull.test:
        Auto merged
      mysql-test/t/gcc296.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/grant_cache.test:
        Auto merged
      mysql-test/t/init_file-master.opt:
        Auto merged
      mysql-test/t/init_file.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/innodb_cache-master.opt:
        Auto merged
      mysql-test/t/innodb_cache.test:
        Auto merged
      mysql-test/t/innodb_handler.test:
        Auto merged
      mysql-test/t/isam.test:
        Auto merged
      mysql-test/t/loaddata.test:
        Auto merged
      mysql-test/t/lock_tables_lost_commit-master.opt:
        Auto merged
      mysql-test/t/lock_tables_lost_commit.test:
        Auto merged
      mysql-test/t/lowercase_table-master.opt:
        Auto merged
      mysql-test/t/lowercase_table.test:
        Auto merged
      mysql-test/t/lowercase_table2.test:
        Auto merged
      mysql-test/t/lowercase_table3-master.opt:
        Auto merged
      mysql-test/t/lowercase_table3.test:
        Auto merged
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/t/multi_update-master.opt:
        Auto merged
      mysql-test/t/lock_multi.test:
        Auto merged
      mysql-test/t/myisam-blob-master.opt:
        Auto merged
      mysql-test/t/myisam-blob.test:
        Auto merged
      mysql-test/t/mysqlbinlog-master.opt:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/packet.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/query_cache_merge.test:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_alter.test:
        Auto merged
      mysql-test/t/rpl_chain_temp_table.test:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysql-test/t/rpl_do_grant.test:
        Auto merged
      mysql-test/t/rpl_empty_master_crash.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table-slave.opt:
        Auto merged
      mysql-test/t/rpl_commit_after_flush.test:
        Auto merged
      mysql-test/t/rpl_drop.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_failsafe.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop-master.opt:
        Auto merged
      mysql-test/t/rpl_flush_log_loop-master.sh:
        Auto merged
      mysql-test/t/rpl_flush_log_loop-slave.opt:
        Auto merged
      mysql-test/t/rpl_flush_log_loop-slave.sh:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_get_lock.test:
        Auto merged
      mysql-test/t/rpl_heap.test:
        Auto merged
      mysql-test/t/rpl_ignore_grant-slave.opt:
        Auto merged
      mysql-test/t/rpl_ignore_grant.test:
        Auto merged
      mysql-test/t/rpl_insert_id.test:
        Auto merged
      mysql-test/t/rpl_free_items.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_m-master.opt:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_m.test:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_s-slave.opt:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_s.test:
        Auto merged
      mysql-test/t/rpl_loaddatalocal.test:
        Auto merged
      mysql-test/t/rpl_log-master.opt:
        Auto merged
      mysql-test/t/rpl_log-slave.opt:
        Auto merged
      mysql-test/t/rpl_master_pos_wait.test:
        Auto merged
      mysql-test/t/rpl_max_relay_size.test:
        Auto merged
      mysql-test/t/rpl_multi_delete-slave.opt:
        Auto merged
      mysql-test/t/rpl_multi_delete.test:
        Auto merged
      mysql-test/t/rpl_multi_delete2.test:
        Auto merged
      mysql-test/t/rpl_optimize.test:
        Auto merged
      mysql-test/t/rpl_relayspace-slave.opt:
        Auto merged
      mysql-test/t/rpl_relayspace.test:
        Auto merged
      mysql-test/t/rpl_reset_slave.test:
        Auto merged
      mysql-test/t/rpl_skip_error-slave.opt:
        Auto merged
      mysql-test/t/rpl_skip_error.test:
        Auto merged
      mysql-test/t/rpl_multi_update.test:
        Auto merged
      mysql-test/t/rpl_multi_update2.test:
        Auto merged
      mysql-test/t/rpl_server_id1.test:
        Auto merged
      mysql-test/t/rpl_server_id2.test:
        Auto merged
      mysql-test/t/rpl_set_charset.test:
        Auto merged
      mysql-test/t/rpl_start_stop_slave.test:
        Auto merged
      mysql-test/t/rpl_trunc_binlog.test:
        Auto merged
      mysql-test/t/system_mysql_db.test:
        Auto merged
      mysql-test/t/system_mysql_db_fix.test:
        Auto merged
      mysql-test/t/system_mysql_db_refs.test:
        Auto merged
      mysql-test/t/system_mysql_db_fix-master.opt:
        Auto merged
      mysql-test/t/timezone-master.opt:
        Auto merged
      mysql-test/t/timezone.test:
        Auto merged
      mysql-test/t/type_set.test:
        Auto merged
      mysql-test/t/variables-master.opt:
        Auto merged
      mysql-test/t/timezone3.test:
        Auto merged
      f6da85f4