1. 30 Nov, 2004 8 commits
    • unknown's avatar
      row0mysql.h, ha_innodb.cc: · f299ff85
      unknown authored
        Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs
      
      
      sql/ha_innodb.cc:
        Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs
      innobase/include/row0mysql.h:
        Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs
      f299ff85
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 409debfa
      unknown authored
      into avenger.(none):/export/brian/mysql/archive-delayed
      
      
      409debfa
    • unknown's avatar
      Changes to support optimized bulk inserts. This will solve the problem of... · 9f726d99
      unknown authored
      Changes to support optimized bulk inserts. This will solve the problem of selects occurring during a bulk insert, and causing the compression factor to drop. 
      
      
      mysql-test/r/archive.result:
        Updated result set for changes amde to support delayed insert and bulk insert optimizations.
      mysql-test/t/archive.test:
        Test cases to test bulk insert statements and delayed insert syntax.
      sql/examples/ha_archive.cc:
        Added methods needed for bulk operations to be optimized. Bulk inserts now do not trigger the file as dirty until they are complete. A normal insert though can still cause them to be synced though since it is not effected by the flag. Removed share variable to determine if row count is right or not (it should not be treated as an upper end estimate).
      sql/examples/ha_archive.h:
        Removed share variable for delayed flag since it is no longer needed. 
        Added flag in table instance to know if a bulk insert is happening.
        
        Added method declarations for bulk insert optimizations.
      9f726d99
    • unknown's avatar
      ndb - Fixed INCORRECT result file for unique index test · 857bd559
      unknown authored
      
      mysql-test/r/ndb_index_unique.result:
        Fixed INCORRECT result file for unique index test! SHAME!
      857bd559
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 88b177a5
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      88b177a5
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 07a65fce
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      mysql-test/r/ndb_index_unique.result:
        Auto merged
      mysql-test/t/ndb_index_unique.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      07a65fce
    • unknown's avatar
      ndb - fixed long overdue problems with unique indexes and null values · 94a5379f
      unknown authored
      
      mysql-test/r/ndb_index_unique.result:
        Test of unique index and null
      mysql-test/t/ndb_index_unique.test:
        Test of unique index and null
      sql/ha_ndbcluster.cc:
        Fixed long overdue problems with unique indexes and null values
      94a5379f
    • unknown's avatar
      Merge · 30c54408
      unknown authored
      30c54408
  2. 29 Nov, 2004 9 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · f52e64cc
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      f52e64cc
    • unknown's avatar
      compatibility fixes · 26fe3289
      unknown authored
      
      mysql-test/r/strict.result:
        fixed
      mysql-test/r/view.result:
        rolled back
      mysql-test/t/information_schema.test:
        fix for 2GB file size limit
      mysql-test/t/ps_1general.test:
        fix for 2GB file size limit
      mysql-test/t/view.test:
        fix for 2GB file size limit
      sql/field.cc:
        double->int conversion troubles
        cleanup
      sql/item_cmpfunc.h:
        warning fixed
      sql/sql_select.cc:
        division by zero fixed
      26fe3289
    • unknown's avatar
      monty.doc: · 59c396e3
      unknown authored
        Grammar fix.
      user.r:
        A few typo fixes.
      
      
      dbug/user.r:
        A few typo fixes.
      dbug/monty.doc:
        Grammar fix.
      59c396e3
    • unknown's avatar
      ndb_grant.later: · 9c678beb
      unknown authored
        Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
      
      
      mysql-test/t/ndb_grant.later:
        Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
      9c678beb
    • unknown's avatar
      Applied some patches for Netware. · 16ae922e
      unknown authored
      
      client/mysqladmin.cc:
        Added option to close the screen on exit for Netware.
      netware/comp_err.def:
        Copyright notice change, for Netware.
      netware/isamchk.def:
        Copyright notice change, for Netware.
      netware/isamlog.def:
        Copyright notice change, for Netware.
      netware/libmysql.def:
        Copyright notice change, for Netware.
      netware/my_print_defaults.def:
        Copyright notice change, for Netware.
      netware/myisam_ftdump.def:
        Copyright notice change, for Netware.
      netware/myisamchk.def:
        Copyright notice change, for Netware.
      netware/myisamlog.def:
        Copyright notice change, for Netware.
      netware/myisampack.def:
        Copyright notice change, for Netware.
      netware/mysql.def:
        Copyright notice change, for Netware.
      netware/mysql_install.def:
        Copyright notice change, for Netware.
      netware/mysql_install_db.def:
        Copyright notice change, for Netware.
      netware/mysql_test_run.def:
        Copyright notice change, for Netware.
      netware/mysql_waitpid.def:
        Copyright notice change, for Netware.
      netware/mysqladmin.def:
        Copyright notice change, for Netware.
      netware/mysqlbinlog.def:
        Copyright notice change, for Netware.
      netware/mysqlcheck.def:
        Copyright notice change, for Netware.
      netware/mysqld.def:
        Copyright notice change, for Netware.
      netware/mysqld_safe.def:
        Copyright notice change, for Netware.
      netware/mysqldump.def:
        Copyright notice change, for Netware.
      netware/mysqlimport.def:
        Copyright notice change, for Netware.
      netware/mysqlshow.def:
        Copyright notice change, for Netware.
      netware/mysqltest.def:
        Copyright notice change, for Netware.
      netware/pack_isam.def:
        Copyright notice change, for Netware.
      netware/perror.def:
        Copyright notice change, for Netware.
      netware/replace.def:
        Copyright notice change, for Netware.
      netware/resolve_stack_dump.def:
        Copyright notice change, for Netware.
      netware/resolveip.def:
        Copyright notice change, for Netware.
      sql/mysqld.cc:
        Changes to fix the abend on NetWare on recieving the server down and volume deactivation
        events. Do not join for the main thread if these events occur.
      16ae922e
    • unknown's avatar
      NdbScanOperation.cpp: · a94df6ee
      unknown authored
        added missing return
      
      
      ndb/src/ndbapi/NdbScanOperation.cpp:
        added missing return
      a94df6ee
    • unknown's avatar
      Adding support for archive to handle delayed inserts. · dc80fc2d
      unknown authored
      
      sql/examples/ha_archive.cc:
        Added support for delayed inserts. What delayed inserts mean for archive is that a sync call is not forced with the next select. Instant performance gain, plus if you aren't concerned about having a consistant read you won't be forced to have less then optimized compression.
      sql/examples/ha_archive.h:
        Added flags for dalyed inserts and added table flag so that the server knows that archive can support them.
      dc80fc2d
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 98cbdf4e
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Auto merged
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      98cbdf4e
    • unknown's avatar
      ndb - scan bug fix + more test cases · d212891f
      unknown authored
      
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Improved doc. a bit
      ndb/src/ndbapi/NdbConnectionScan.cpp:
        Set error code
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Check error directly after taking mutex
      ndb/test/ndbapi/testScan.cpp:
        new scan test with lots of threads
      ndb/test/run-test/daily-basic-tests.txt:
        Added two more scan tests
        Collapsed testTransactions & testOperations
      d212891f
  3. 28 Nov, 2004 15 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 2d527b72
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      2d527b72
    • unknown's avatar
      don't cast LEX_STRING to char* :) · fe46667a
      unknown authored
      fe46667a
    • unknown's avatar
      merged · 8b244fc6
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      mysql-test/r/rpl_start_stop_slave.result:
        Auto merged
      scripts/mysql_fix_privilege_tables.sh:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      mysql-test/r/select.result:
        !bk-eb
      mysql-test/t/select.test:
        !bk-eb
      8b244fc6
    • unknown's avatar
      post-merge fix · 1b898a22
      unknown authored
      1b898a22
    • unknown's avatar
      Fix for division by zero problem: · 46e12a2b
      unknown authored
       * Don't try building ROR-intersect if the queried table has zero rows
       * Don't ever produce an estimate of zero returned rows.
      
      
      46e12a2b
    • unknown's avatar
      merged · dd33501f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      innobase/srv/srv0srv.c:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      dd33501f
    • unknown's avatar
      view.test: · 4c9c3f32
      unknown authored
      more max_rows for show table status
      comment spellchecking...
      
      
      mysql-test/r/view.result:
        more max_rows for show table status
      mysql-test/t/view.test:
        more max_rows for show table status
        comment spellchecking...
      4c9c3f32
    • unknown's avatar
      limit Max_data_length in 'show table status' · 63c3ab1e
      unknown authored
      63c3ab1e
    • unknown's avatar
      bad merge fixed · 5607539c
      unknown authored
      5607539c
    • unknown's avatar
      fix for decimal.c · d2c7736c
      unknown authored
      
      strings/decimal.c:
        fix
      d2c7736c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 323284d5
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      323284d5
    • unknown's avatar
      skip last compress test if we're short of RAM · 1a7783e0
      unknown authored
      1a7783e0
    • unknown's avatar
      protection: TRASH in delete · 30db8445
      unknown authored
      fixed a bug that it discovered
      
      
      include/my_sys.h:
        move TRASH to my_sys.h from sql_list.h
      sql/field.h:
        use TRASH macro
      sql/item.h:
        TRASH in delete
      sql/item_func.h:
        never delete item's manually!
      sql/opt_range.cc:
        TRASH in delete
      sql/sql_lex.h:
        TRASH in delete
      sql/sql_list.h:
        move TRASH to my_sys.h from sql_list.h
      sql/sql_parse.cc:
        don't use properties of deleted objects (even when it's safe)
      sql/sql_select.cc:
        TRASH in delete
      sql/sql_show.cc:
        TRASH in delete
      sql/sql_string.h:
        TRASH in delete
      30db8445
    • unknown's avatar
      configure.in: · 8f60d95c
      unknown authored
        A work-around for SCO, disable use of clock_gettime
      
      
      configure.in:
        A work-around for SCO, disable use of clock_gettime
      8f60d95c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 7a1ffc06
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      7a1ffc06
  4. 27 Nov, 2004 7 commits
    • unknown's avatar
      create/drop/rename user cleanup · 257763a9
      unknown authored
      
      dbug/user.r:
        help cralified
      include/mysqld_error.h:
        new error message added
      mysql-test/r/grant.result:
        results updated
      mysql-test/r/grant2.result:
        results updated
      mysql-test/t/grant.test:
        results updated
      mysql-test/t/grant2.test:
        results updated
      sql/share/czech/errmsg.txt:
        error message updated
      sql/share/danish/errmsg.txt:
        error message updated
      sql/share/dutch/errmsg.txt:
        error message updated
      sql/share/english/errmsg.txt:
        error message updated
      sql/share/estonian/errmsg.txt:
        error message updated
      sql/share/french/errmsg.txt:
        error message updated
      sql/sql_acl.cc:
        changed error reporting for create/drop/rename user to be consistent with drop table
      sql/share/german/errmsg.txt:
        error message updated
      sql/share/greek/errmsg.txt:
        error message updated
      sql/share/hungarian/errmsg.txt:
        error message updated
      sql/share/italian/errmsg.txt:
        error message updated
      sql/share/japanese/errmsg.txt:
        error message updated
      sql/share/korean/errmsg.txt:
        error message updated
      sql/share/norwegian-ny/errmsg.txt:
        error message updated
      sql/share/norwegian/errmsg.txt:
        error message updated
      sql/share/polish/errmsg.txt:
        error message updated
      sql/share/portuguese/errmsg.txt:
        error message updated
      sql/share/romanian/errmsg.txt:
        error message updated
      sql/share/russian/errmsg.txt:
        error message updated
      sql/share/serbian/errmsg.txt:
        error message updated
      sql/share/slovak/errmsg.txt:
        error message updated
      sql/share/spanish/errmsg.txt:
        error message updated
      sql/share/swedish/errmsg.txt:
        error message updated
      sql/share/ukrainian/errmsg.txt:
        error message updated
      257763a9
    • unknown's avatar
      d777a9aa
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · cf1de7d9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
      
      
      cf1de7d9
    • unknown's avatar
      fix decimal2longlong too · df1f7cab
      unknown authored
      
      mysql-test/r/rpl_start_stop_slave.result:
        results updated
      df1f7cab
    • unknown's avatar
      mysql_priv.h: · 4a9e7d38
      unknown authored
        Reverts incomplete change of insert_fields()
      
      
      sql/mysql_priv.h:
        Reverts incomplete change of insert_fields()
      4a9e7d38
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 87347253
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      87347253
    • unknown's avatar
      better overflow checks in decimal2ulonglong · 368cde22
      unknown authored
      better truncation check in decimal2ulonglong
      
      
      368cde22
  5. 26 Nov, 2004 1 commit