1. 19 Aug, 2005 6 commits
    • 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
      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
  2. 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
  3. 17 Aug, 2005 6 commits
    • 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
  4. 16 Aug, 2005 6 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
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · af13588c
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      af13588c
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · bd197673
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538
      
      
      acinclude.m4:
        Auto merged
      bd197673
    • unknown's avatar
      subselect.result: · 4161d7cb
      unknown authored
        Added missing drop statement
      subselect.test:
        Added missing drop statement.
      
      
      mysql-test/t/subselect.test:
        Added missing dro statement.
      mysql-test/r/subselect.result:
        Added missing drop statement
      4161d7cb
    • unknown's avatar
      sql_select.cc: · 4b49cbfb
      unknown authored
        Fixed bug #11479.
        The JOIN::reinit method cannot call setup_tables
        after the optimization phase since this function
        removes some optimization settings for joined
        tables. E.g. it resets values of the null_row flag to 0.
      subselect.result, subselect.test:
        Added a test case for bug #11479.
      
      
      mysql-test/t/subselect.test:
        Added a test case for bug #11479.
      mysql-test/r/subselect.result:
        Added a test case for bug #11479.
      sql/sql_select.cc:
        Fixed bug #11479.
        The JOIN::reinit method cannot call setup_tables
        after the optimization phase since this function
        removes some optimization settings for joined
        tables. E.g. it resets values of the null_row flag to 0.
      4b49cbfb
  5. 15 Aug, 2005 5 commits
  6. 13 Aug, 2005 4 commits
    • unknown's avatar
      Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · e8d9dccb
      unknown authored
      into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
      
      
      e8d9dccb
    • unknown's avatar
      Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · 208be175
      unknown authored
      into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
      
      
      208be175
    • unknown's avatar
      fixed convertion and handling IN subqueries with rows (BUG#11867) · 19b4760f
      unknown authored
      
      mysql-test/r/subselect.result:
        testst of IN subqueries with row
      mysql-test/t/subselect.test:
        tests of ion subqueries with row
      sql/item.h:
        add method to prevent of removing Item_ref_null_helper from HAVING
      sql/item_cmpfunc.h:
        Prevented removing of Item_test_isnotnull from HAVING
      sql/item_subselect.cc:
        fixed converting row IN subqueries
      sql/sql_select.cc:
        fixed debug print
      19b4760f
    • unknown's avatar
      sql_parse.cc: · 66b97195
      unknown authored
        Don't skip SET command even if --replicate-wild* says to.
        E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
      
      
      sql/sql_parse.cc:
        Don't skip SET command even if --replicate-wild* says to.
        E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
      66b97195
  7. 12 Aug, 2005 7 commits