1. 07 Apr, 2005 2 commits
    • unknown's avatar
      ndb - DbtupScan.cpp added · b395f235
      unknown authored
      b395f235
    • unknown's avatar
      ndb - wl-2455 TUP scan for testing in 5.0 · 19cedc5e
      unknown authored
      
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        fix readTuples signature
      ndb/include/ndbapi/NdbScanOperation.hpp:
        fix readTuples signature
      ndb/src/ndbapi/NdbScanOperation.cpp:
        fix readTuples signature
      ndb/test/include/HugoTransactions.hpp:
        fix readTuples signature
      ndb/test/ndbapi/testScanPerf.cpp:
        fix readTuples signature
      ndb/test/src/HugoOperations.cpp:
        fix readTuples signature
      ndb/test/src/HugoTransactions.cpp:
        fix readTuples signature
      ndb/test/ndbapi/testOIBasic.cpp:
        fix readTuples signature
      ndb/include/kernel/signaldata/AccScan.hpp:
        TUP scan for testing in 5.0
      ndb/include/kernel/signaldata/NextScan.hpp:
        TUP scan for testing in 5.0
      ndb/include/kernel/signaldata/ScanFrag.hpp:
        TUP scan for testing in 5.0
      ndb/include/kernel/signaldata/ScanTab.hpp:
        TUP scan for testing in 5.0
      ndb/src/common/debugger/signaldata/ScanTab.cpp:
        TUP scan for testing in 5.0
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        TUP scan for testing in 5.0
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        TUP scan for testing in 5.0
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        TUP scan for testing in 5.0
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        TUP scan for testing in 5.0
      ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        TUP scan for testing in 5.0
      ndb/src/kernel/blocks/dbtup/Makefile.am:
        TUP scan for testing in 5.0
      ndb/test/ndbapi/testScan.cpp:
        TUP scan for testing in 5.0
      19cedc5e
  2. 05 Apr, 2005 3 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5810ee1c
      unknown authored
      into mysql.com:/export/space/pekka/ndb/version/my50-ndb
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      mysql-test/mysql-test-run.sh:
        Auto merged
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      5810ee1c
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2cb2374b
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      2cb2374b
    • unknown's avatar
      Skip new test with embedded server · 47527f6a
      unknown authored
      
      mysql-test/t/view_grant.test:
        Skip test with embedded server
      47527f6a
  3. 04 Apr, 2005 20 commits
    • unknown's avatar
      Fix merge of tests that were split out of other test files · 754874fd
      unknown authored
      
      mysql-test/r/ctype_ucs_binlog.result:
        Update results
      mysql-test/r/timezone_grant.result:
        Update results
      mysql-test/r/user_var-binlog.result:
        Update results
      mysql-test/t/ctype_ucs_binlog.test:
        Update binlog starting position
      mysql-test/t/timezone_grant.test:
        Update error numbers
      mysql-test/t/user_var-binlog.test:
        Update binlog starting position
      754874fd
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 4cfd77d9
      unknown authored
      into mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      4cfd77d9
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · e9e64527
      unknown authored
      into mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      e9e64527
    • unknown's avatar
      Don't generate message in send_kill_message() if wrong data. (Caused core dump... · f3aa7770
      unknown authored
      Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)
      
      
      sql/item_timefunc.cc:
        Removed warning reported by valgrind
      sql/sql_error.cc:
        Fixed comment
      sql/sql_table.cc:
        Fixed comment
      f3aa7770
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ade7693
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      4ade7693
    • unknown's avatar
      Now one gets an error if one tries to insert an invalid value via a stored... · ae25f8df
      unknown authored
      Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug #5907)
      
      
      client/mysqldump.c:
        Changed some function and variable names to MySQL syntax
        Fixed indentation for last few pushes
        (No logic changes)
      mysql-test/r/strict.result:
        Test for bug #5907 (Traditional mode: invalid value can be inserted via a stored procedure)
      mysql-test/t/strict.test:
        Test for bug #5907 (Traditional mode: invalid value can be inserted via a stored procedure)
      sql/sql_base.cc:
        More comments
      sql/sql_error.cc:
        Ensure that PS gives error for invalid values in 'strict' mode
      ae25f8df
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · a1112ca0
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      a1112ca0
    • unknown's avatar
      Cleanup tests and results after merge from 4.1 of embedded · 4189e7c8
      unknown authored
      server testing cleanups.
      
      
      mysql-test/r/innodb.result:
        Update results
      mysql-test/r/insert_select-binlog.result:
        Update results
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Update results
      mysql-test/r/ps_1general.result:
        Update results
      mysql-test/r/ps_grant.result:
        Update results
      mysql-test/r/view.result:
        Update results
      mysql-test/t/client_xml.test:
        Skip test with embedded server
      mysql-test/t/flush_read_lock_kill.test:
        Skip test with embedded server
      mysql-test/t/grant3.test:
        Skip test with embedded server
      mysql-test/t/information_schema.test:
        Skip test with embedded server
      mysql-test/t/innodb.test:
        Fix up filenames
      mysql-test/t/multi_update.test:
        Skip test with embedded server
      mysql-test/t/mysqlshow.test:
        Skip test with embedded server
      mysql-test/t/ps_1general.test:
        Move grant-related tests to ps_grant, and fix cleanup of filename
      mysql-test/t/ps_grant.test:
        Add additional tests
      mysql-test/t/sp-security.test:
        Skip test with embedded server
      mysql-test/t/user_limits.test:
        Skip test with embedded server
      mysql-test/t/view.test:
        Split grant-related tests to new test file view_grant
      4189e7c8
    • unknown's avatar
      ha_innodb.cc, row0sel.c: · 1b932713
      unknown authored
        Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer
      
      
      innobase/row/row0sel.c:
        Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer
      sql/ha_innodb.cc:
        Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer
      1b932713
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.1 · b1a9b761
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      
      sql/ha_innodb.cc:
        SCCS merged
      b1a9b761
    • unknown's avatar
      ha_innodb.cc: · a64487fc
      unknown authored
        Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
      
      
      sql/ha_innodb.cc:
        Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
      a64487fc
    • unknown's avatar
      ha_innodb.cc: · 9ce74a80
      unknown authored
        Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
      
      
      sql/ha_innodb.cc:
        Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
      9ce74a80
    • unknown's avatar
      Merge · bee2a64d
      unknown authored
      
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      mysql-test/t/type_ranges.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/type_ranges.result:
        Update results
      bee2a64d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 9176a1f4
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      9176a1f4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d17aebaa
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      d17aebaa
    • unknown's avatar
      Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly · ce169a54
      unknown authored
      Fix that mysql.proc works with new VARCHAR fields
      Give warnings for wrong zero dates
      
      
      configure.in:
        Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
      mysql-test/r/func_time.result:
        New warnings
      mysql-test/r/row.result:
        Moved code around to get things to work with --ps-protocol
        Note that one on warning disappered, but it should appear again when bug #9600 is fixed
      mysql-test/r/strict.result:
        enabled more tests
        Added more tests
      mysql-test/r/union.result:
        Test that UNION generates correct row format
      mysql-test/t/row.test:
        Moved test to get things to work with --ps-protocol
      mysql-test/t/strict.test:
        enabled more tests
        Added more tests
      mysql-test/t/union.test:
        Test that UNION generates correct row format
      sql/item.cc:
        Removed compiler warning
        Simple cleanup
      sql/sp.cc:
        Fix that mysql.proc works with new VARCHAR fields
      sql/time.cc:
        Give warnings for wrong zero dates
      tests/mysql_client_test.c:
        More startup information
      ce169a54
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 73ddce6d
      unknown authored
      into mysql.com:/usr/home/bar/mysql-5.0
      
      
      strings/ctype-uca.c:
        Auto merged
      73ddce6d
    • unknown's avatar
      ctype_uca.result: · 07182f5a
      unknown authored
        fixing test results accordingly.
      ctype-uca.c:
        It appeared that in traditional Spanish collation
        'RR' is not equal to 'R', as Unicode and Mimer state.
        We'll go Oracle and IBM way instead:
        No special rules to 'RR'.
      
      
      strings/ctype-uca.c:
        It appeared that in traditional Spanish collation
        'RR' is not equal to 'R', as Unicode and Mimer state.
        We'll go Oracle and IBM way instead:
        No special rules to 'RR'.
      mysql-test/r/ctype_uca.result:
        fixing test results accordingly.
      07182f5a
    • unknown's avatar
      Fix for bit type: · c2a3c289
      unknown authored
      we have to handle bit fields as well.
      
      
      c2a3c289
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 042a3ced
      unknown authored
      into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/sql_show.cc:
        Auto merged
      042a3ced
  4. 03 Apr, 2005 8 commits
    • unknown's avatar
      Enable IM in the binary distribution and fix Bug #9513 (mysql.server script... · d67f4397
      unknown authored
      Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
      doesn't work out of the box)
      
      
      client/Makefile.am:
        old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into mysqltestmanager, mysqltestmanagerc and
        mysqltestmanager-pwgen respectively
      mysql-test/mysql-test-run.sh:
        Old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into
        mysqltestmanager, mysqltestmanagerc and mysqltestmanager-pwgen respectively
      scripts/make_binary_distribution.sh:
        Fix the script to include IM and process mysql.server correctly
      server-tools/instance-manager/Makefile.am:
        change default socket name to follow mysqld style (and thus, fix the ptoblem with non-existant localstatedir
        in the binary distribution)
      support-files/mysql.spec.sh:
        Fix mysql.spec template to reflect the name change
      tools/Makefile.am:
        old mysqlmanager renamed into mysqltestmanager
      d67f4397
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · e1afce06
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
      
      
      e1afce06
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 690ebd81
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-trg3
      
      
      sql/handler.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      690ebd81
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · b978c663
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      b978c663
    • unknown's avatar
      Bug #3891 - "DROP TABLE many-unexistent-tables, was printing an error with · 0af662b9
      unknown authored
      %s instead of table names".
      
      Propagating changes from old language-specific errmsg.txt files to new
      global errmsg.txt.
      
      
      sql/share/errmsg.txt:
        Allow longer "table names" as DROP TABLE puts a list here.
      0af662b9
    • unknown's avatar
      Merge of patch for bug #3891 into 5.0 tree. · da70ad54
      unknown authored
      
      BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
        Auto merged
      BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
        Auto merged
      mysql-test/r/drop.result:
        Auto merged
      BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
        Auto merged
      mysql-test/r/type_timestamp.result:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      mysql-test/t/type_timestamp.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/sql_table.cc:
        Manual merge.
      da70ad54
    • unknown's avatar
      Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned · 98e615ba
      unknown authored
      when using --new" into 4.1 tree.
      
      
      mysql-test/r/type_timestamp.result:
        Manual merge.
      mysql-test/t/type_timestamp.test:
        Manual merge.
      sql/field.cc:
        Manual merge.
      sql/field.h:
        Manual merge.
      98e615ba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 64978db1
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
      
      
      64978db1
  5. 02 Apr, 2005 7 commits
    • unknown's avatar
      - stackoverflow check added for view of view processing · a50bf2f0
      unknown authored
      - fixed bug in join view processing
      - postreview fixes (BUG#9398 & BUG#8703)
      
      
      sql/sql_base.cc:
        used original TABLE object to get correct name of table and db
      sql/sql_view.cc:
        fixed bug of assigning select_lex for join view
      sql/table.cc:
        comment fixed
        stack overflow check added
        new method for underlying base table finding
      sql/table.h:
        comment fixed
        new method for underlying base table finding
      a50bf2f0
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · ecf8732c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      ecf8732c
    • unknown's avatar
      results updated · a77a2c83
      unknown authored
      a77a2c83
    • unknown's avatar
      merged · 5f8c654a
      unknown authored
      
      mysql-test/r/drop.result:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      5f8c654a
    • unknown's avatar
      bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names · 7d865e0b
      unknown authored
      sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)
      
      
      mysql-test/r/drop.result:
        bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
      mysql-test/t/drop.test:
        bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
      sql/share/english/errmsg.txt:
        allow longer "table names" as DROP TABLE puts a list here
      sql/share/russian/errmsg.txt:
        allow longer "table names" as DROP TABLE puts a list here
      sql/share/ukrainian/errmsg.txt:
        allow longer "table names" as DROP TABLE puts a list here
      sql/sql_table.cc:
        print an error with a function that respects width modifiers (%.64s)
      7d865e0b
    • unknown's avatar
      postreview patch · cdad0890
      unknown authored
      
      sql/sql_view.cc:
        wording fixed
      cdad0890
    • unknown's avatar
      fix of required privileges for altering view VIEW (DELETE->DROP) (BUG#9260) · 9139be50
      unknown authored
      
      mysql-test/r/view.result:
        fix of required privileges for altering view VIEW (DELETE->DROP)
        new test of altering view
      mysql-test/t/view.test:
        fix of required privileges for altering view VIEW (DELETE->DROP)
        new test of altering view
      sql/sql_view.cc:
        fix of required privileges for altering view VIEW (DELETE->DROP)
      9139be50