1. 25 Aug, 2005 1 commit
    • unknown's avatar
      config: · 685c9a05
      unknown authored
        changed tomas default checkout
      
      
      BitKeeper/etc/config:
        changed tomas default checkout
      685c9a05
  2. 23 Aug, 2005 2 commits
    • unknown's avatar
      removed ndb grep from configure .in · a797112c
      unknown authored
      
      BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0:
        Delete: ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile
      BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
        Delete: ndb/src/kernel/blocks/grep/Grep.cpp
      BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc:
        Delete: ndb/src/kernel/blocks/grep/Makefile.am
      BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
        Delete: ndb/src/kernel/blocks/grep/Grep.hpp
      BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd:
        Delete: ndb/src/kernel/blocks/grep/GrepInit.cpp
      BitKeeper/deleted/.del-Makefile~b293ae88e4394490:
        Delete: ndb/src/kernel/blocks/grep/systab_test/Makefile
      BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62:
        Delete: ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp
      BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5:
        Delete: ndb/test/ndbapi/testGrep.cpp
      a797112c
    • unknown's avatar
      enabled make of ndb_redo_log_reader · 8803c688
      unknown authored
      8803c688
  3. 22 Aug, 2005 3 commits
  4. 21 Aug, 2005 2 commits
  5. 20 Aug, 2005 2 commits
  6. 19 Aug, 2005 14 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · a8031724
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      a8031724
    • unknown's avatar
      Fix ctype_cp932 test to be deterministic on different machines. · ab39c1ba
      unknown authored
      
      mysql-test/r/ctype_cp932.result:
        Update results to make them deterministic
      mysql-test/t/ctype_cp932.test:
        Updated test to be deterministic on all machines
      ab39c1ba
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 30e9a3ec
      unknown authored
      into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean
      
      
      sql/mysqld.cc:
        Auto merged
      30e9a3ec
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 5ff24316
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      5ff24316
    • unknown's avatar
      Bug#11338 Fixes from review (identical functionality). · 1b970e94
      unknown authored
      
      include/my_sys.h:
        Fixes from review (use version in log_event.cc instead)
      mysql-test/r/ctype_cp932.result:
        Updated test for bug#11338 (logging of prepared statement w/ blob type)
      mysql-test/t/ctype_cp932.test:
        udpated test for bug#11338 (logging of prepared statement w/ blob type)
      mysys/charset.c:
        Fixes from review (use version in log_event.cc instead)
      sql/item.cc:
        Fixes from review (store character_set_client differently so that
        fix can be merged forward to 5.0)
      sql/item.h:
        Fixes from review
      sql/log_event.cc:
        Fixes from review, str_to_hex is now used by item.cc
      sql/log_event.h:
        Added prototype for str_to_hex (now used by item.cc)
      sql/sql_prepare.cc:
        Fixes from review, store character_set_client differently so that 
        Item_param::query_val_str can use it.
      1b970e94
    • unknown's avatar
      distinct.test, distinct.result: · 01f4258a
      unknown authored
        Added test cases for bug #12625.
      sql_select.cc:
        Fixed bug #12625.
        Fixed invalid removal of constant items from the DISTINCT
        list in the function create_distinct_group.
      
      
      sql/sql_select.cc:
        Fixed bug #12625.
      mysql-test/r/distinct.result:
        Added test cases for bug #12625.
      mysql-test/t/distinct.test:
        Added test cases for bug #12625.
      01f4258a
    • unknown's avatar
      Merge eel.(none):/home/jonas/src/mysql-4.1 · 91b19214
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1-push
      
      
      91b19214
    • unknown's avatar
      ndb - · 9c668f7f
      unknown authored
      remove grep from Makefile
      
      
      ndb/src/kernel/Makefile.am:
        remove grep from Makefile
      9c668f7f
    • unknown's avatar
      jonas - · 83fbcef1
      unknown authored
      Fix checkout properties
      
      
      BitKeeper/etc/config:
        Fix checkout properties
      83fbcef1
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8ff3f16d
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1-push
      
      
      8ff3f16d
    • unknown's avatar
      Merge eel.(none):/home/jonas/src/mysql-4.1-push · 678d97ee
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1
      
      
      mysql-test/t/ndb_config.test:
        Auto merged
      ndb/tools/Makefile.am:
        Auto merged
      ndb/tools/ndb_config.cpp:
        Auto merged
      678d97ee
    • unknown's avatar
      BUG #12498 Fixed mispelling · cf312a78
      unknown authored
      
      sql/mysqld.cc:
        BUG #12498 Fixed Mispelled 'type'
      cf312a78
    • unknown's avatar
      ndb · af1652d5
      unknown authored
      rename config.cpp -> ndb_config.cpp for case insesitive filesystems
      why wasn't this done in 4.1 directly
      
      
      ndb/tools/ndb_config.cpp:
        Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
      mysql-test/t/ndb_config.test:
        remove include only present in 5.0
      ndb/tools/Makefile.am:
        rename config.cpp -> ndb_config.cpp for case insesitive filesystems
        why wasn't this done in 4.1 directly
      af1652d5
    • unknown's avatar
      updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). · 4652c6b0
      unknown authored
      We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
      suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
      logging now is done in batches - new batch is started if the buffer becomes full.
      Reduced memory usage by reusing the table list instead of accumulating a list of 
      dropped table names. Also fixed the problem if the table was not actually dropped, eg
      due to permissions. Extended the test case to make sure batched query 
      logging does work.  
      
      
      mysql-test/r/rpl_drop_db.result:
        test for query buffer overrun
      mysql-test/t/rpl_drop_db.test:
        test for query buffer overrun
      sql/mysql_priv.h:
        updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
      BitKeeper/etc/ignore:
        Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list
      sql/sql_db.cc:
        updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
      sql/sql_table.cc:
        updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
      sql/table.h:
        updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
      4652c6b0
  7. 18 Aug, 2005 6 commits
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · 496e86da
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      netware/BUILD/nwbootstrap:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      include/config-netware.h:
        Manual merge from 4.0 to 4.1.
      496e86da
    • unknown's avatar
      Some minor fixes for Netware. These were required after we started building · 9b76bca8
      unknown authored
      against a later version of libc.
      
      
      include/config-netware.h:
        Changes for Netware. Needed to build against newer libc.
      netware/BUILD/nwbootstrap:
        Fix to build script.
      sql/mysqld.cc:
        Added an include.
      9b76bca8
    • unknown's avatar
      Changes for Netware. This is needed when building against newer Libc · cd737f81
      unknown authored
      than we've used before.
      
      
      cd737f81
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 288c2637
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      288c2637
    • unknown's avatar
      Merge eel.(none):/home/jonas/src/mysql-4.1 · bdbe25de
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1-push
      
      
      mysql-test/t/ndb_config.test:
        Auto merged
      ndb/src/common/util/version.c:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/ndbapi/TransporterFacade.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      mysql-test/t/ndb_alter_table.test:
        merge
      bdbe25de
    • unknown's avatar
      bug#12118 - ndb alter table data loss · c7744c6d
      unknown authored
        Split table version into 2 (major, minor)
        Impl. signaling to API when table has been altered
        Allow running transactions to use any minor number for transactions
      
      
      mysql-test/r/ndb_alter_table.result:
        Allow running transactions to use old table definition when possible.
      mysql-test/t/ndb_alter_table.test:
        Allow running transactions to use old table definition when possible.
      ndb/include/kernel/BlockNumbers.h:
        remove GREP
      ndb/include/kernel/GlobalSignalNumbers.h:
        Add ALTER_TABL_REP and API_BROADCAST_REP
      ndb/include/kernel/kernel_types.h:
        table_version_major
      ndb/include/kernel/signaldata/AlterTable.hpp:
        New error code for alter table during rolling upgrade
      ndb/include/ndbapi/NdbDictionary.hpp:
        Add state on table object to represent an altered but still valid table object
      ndb/src/common/debugger/BlockNames.cpp:
        remove GREP
      ndb/src/common/util/version.c:
        Fix upgrades
      ndb/src/kernel/SimBlockList.cpp:
        remove GREP
      ndb/src/kernel/blocks/Makefile.am:
        remove GREP
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        remove GREP
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Split tableSchemaVersion into 2 part
        24 bit real version
         8 bit for online alter table where old table definition is still usable
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Check for same ndb versions
      ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
        Update schema printer
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        remove grep
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        1) Use table_ version_major when checking table version
        2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        1) Use table_ version_major when checking table version
        2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        1) Use table_ version_major when checking table version
        2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        remove GREP
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Add support for sending REP to ALL api nodes
      ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
        Add support for sending REP to ALL api nodes
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Add support for sending REP to ALL api nodes
      ndb/src/kernel/blocks/suma/Suma.cpp:
        remove GREP
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        remove GREP
      ndb/src/ndbapi/DictCache.cpp:
        Add support for alter_table_rep
          by setting status to Altered
        
        NOTE special handling of tables in state RETREIVING
      ndb/src/ndbapi/DictCache.hpp:
        Add support for alter_table_rep
          by setting status to Altered
        
        NOTE special handling of tables in state RETREIVING
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Change alter table so that remove from global cache is used wo/ retreiving it from there first
          as ALTER_TABLE_REP might already have changed the table object...
      ndb/src/ndbapi/TransporterFacade.cpp:
        Add support for ALTER_TABLE_REP
      sql/ha_ndbcluster.cc:
        Allow running transactions to use tables in state ALTERED...but new transactions may not...
      ndb/include/kernel/signaldata/ApiBroadcast.hpp:
        New BitKeeper file ``ndb/include/kernel/signaldata/ApiBroadcast.hpp''
      c7744c6d
  8. 17 Aug, 2005 8 commits
    • unknown's avatar
      Fix bug #11718 query with function, join and order by returns wrong type. · e80aa010
      unknown authored
      create_tmp_field_from_item() was creating tmp field without regard to
      original field type of Item. This results in wrong type being reported to
      client.
      
      To create_tmp_field_from_item() added special handling for Items with 
      DATE/TIME field types to preserve their type.
      
      
      sql/sql_select.cc:
        Fix bug #11718 query with function, join and order by returns wrong type.
      tests/mysql_client_test.c:
        Test case for bug #11718: query with function, join and order by returns wrong type
      e80aa010
    • unknown's avatar
      Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6345af6d
      unknown authored
      into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      6345af6d
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 67d94b1c
      unknown authored
      into  linux.site:/home/reggie/bk/mysql-4.1
      
      
      67d94b1c
    • unknown's avatar
    • unknown's avatar
      mysql-test-run.pl, mtr_misc.pl: · a80110f7
      unknown authored
        Bug#12615: Host name might not resolve, use short host name
      
      
      mysql-test/lib/mtr_misc.pl:
        Bug#12615: Host name might not resolve, use short host name
      mysql-test/mysql-test-run.pl:
        Bug#12615: Host name might not resolve, use short host name
      a80110f7
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 · 99cf8c38
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
      
      
      sql/item.h:
        Auto merged
      99cf8c38
    • unknown's avatar
      BUG#11338 (logging of prepared statement w/ blob type) · a29b1d71
      unknown authored
      In cp932, '\' character can be the second byte in a 
      multi-byte character stream. This makes it difficult to use
      mysql_escape_string. Added flag to indicate which languages allow
      '\' as second byte of multibyte sequence so that when putting a prepared
      statement into the binlog we can decide at runtime whether hex encoding
      is really needed.
      
      
      include/m_ctype.h:
        Added bool to indicate character sets which allow '\' as the second
        byte of a multibyte character set (currently only cp932). For these
        character sets, escaping with '\' is dangerous and leads to corruption
        in replication.
      include/my_sys.h:
        Add function to enocde a string as hex with no prefix (bare)
      mysys/charset.c:
        Add function to encode string as hex with no prefix (bare).
      sql/item.cc:
        Check the connection character set to see if escape_string_for_mysql
        is safe, or if character set requires unambiguous (hex) encoding
      sql/item.h:
        Pass thd to query_val_str for access to charset()
      sql/sql_prepare.cc:
        Pass thd to query_val_str.
      strings/ctype-big5.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-bin.c:
        Add escape_with_backslash_is_dangerous flag
      strings/ctype-cp932.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-czech.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-euc_kr.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-extra.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-gb2312.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-gbk.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-latin1.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-sjis.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-tis620.c:
        Added esacpe_with_backslash_character_is_dangerous flag.
      strings/ctype-uca.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-ucs2.c:
        Added escape_with_backslash_is_dangerous.
      strings/ctype-ujis.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-utf8.c:
        Added escape_with_backslash_is_dangerous.
      strings/ctype-win1250ch.c:
        Added escape_with_backslash_is_dangerous.
      a29b1d71
    • unknown's avatar
      mysql-test-run.pl: · 0f7bb92d
      unknown authored
        Bug#11884: Corrected --start-and-exit, start the server
        as if the default/specified test case would have been run
      
      
      mysql-test/mysql-test-run.pl:
        Bug#11884: Corrected --start-and-exit, start the server
        as if the default/specified test case would have been run
      0f7bb92d
  9. 16 Aug, 2005 2 commits
    • unknown's avatar
      mtr_process.pl: · ee793d03
      unknown authored
        Bug#11792: Check all of status code, to catch a crash as a failure
      mtr_cases.pl:
        Code cleanup for skipped/disabled handling
      mtr_process.pl:
        In debug mode, report if mysqladmin did not at least
        make the server stop listening to the port.
        Increased the time waiting for terminating to 20 seconds,
        to wait for really slow slave shutdown.
        Added call to start_reap_all(), to avoid zombies.
      mtr_report.pl:
        Removed prototype for unused function mtr_report_test_disabled()
      
      
      mysql-test/lib/mtr_report.pl:
        Removed prototype for unused function mtr_report_test_disabled()
      mysql-test/lib/mtr_cases.pl:
        Code cleanup for skipped/disabled handling
      mysql-test/lib/mtr_process.pl:
        Bug#11792: Check all of status code, to catch a crash as a failure
      ee793d03
    • unknown's avatar
      mtr_process.pl: · 996eb5df
      unknown authored
        Bug#12094: Let sleep_until_file_created() return the pid as intended
      
      
      mysql-test/lib/mtr_process.pl:
        Bug#12094: Let sleep_until_file_created() return the pid as intended
      996eb5df