1. 17 Mar, 2005 11 commits
    • unknown's avatar
      endspace.result: · e4a2c7e9
      unknown authored
        Someone has fixed the calculation of length() for a returned InnoDB VARCHAR value: update endspace.result to have the correct value length('teststring') == 10
      
      
      mysql-test/r/endspace.result:
        Someone has fixed the calculation of length() for a returned InnoDB VARCHAR value: update endspace.result to have the correct value length('teststring') == 10
      e4a2c7e9
    • unknown's avatar
      Manual merge. · 94c3958e
      unknown authored
      94c3958e
    • unknown's avatar
      after merge fix · 0c0a2d55
      unknown authored
      0c0a2d55
    • unknown's avatar
      Merge 4.1 -> 5.0 · 17791f95
      unknown authored
      
      heap/hp_create.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/key.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_string.h:
        Auto merged
      client/mysqldump.c:
        Manual merge
      mysql-test/r/func_gconcat.result:
        Manual merge
      mysql-test/r/func_str.result:
        Manual merge
      mysql-test/t/func_gconcat.test:
        Manual merge
      sql/ha_heap.cc:
        Manual merge
      sql/sql_select.cc:
        Manual merge
      17791f95
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 621abfac
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
      
      
      621abfac
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4079a85a
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
      
      
      4079a85a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 5c1b91f1
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/handler.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      5c1b91f1
    • unknown's avatar
      Merge · 3e4ae65a
      unknown authored
      
      sql/key.cc:
        Auto merged
      mysql-test/r/update.result:
        SCCS merged
      mysql-test/t/update.test:
        SCCS merged
      3e4ae65a
    • unknown's avatar
      A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop). · 7ceb5c6c
      unknown authored
      
      sql/key.cc:
        A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
        For "partial" key parts (e.g. key(a(20), ...) we create different
        key_part->field, see sql/table.cc; so we have to use the eq() 
        function here to compare fields.
      7ceb5c6c
    • unknown's avatar
      Fixed two bugs in MySQL ACL. · 2bbde22d
      unknown authored
      First one is related to Bug#7905. One should not be allowed to
      create new user with password without UPDATE privilege to
      MySQL database. Furthermore, executing the same GRANT statement
      twice would actually crash the server and corrupt privilege database.
      
      Other bug was that one could update a column, using the existing
      value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
      without SELECT privilege to the field (a in the above example)
      
      Fixed tests grant.pl and grant2, which were wrong.
      
      
      2bbde22d
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · a131e4d1
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      sql/item.h:
        Auto merged
      a131e4d1
  2. 16 Mar, 2005 29 commits
    • unknown's avatar
      olap.result, olap.test: · 31f6b0dd
      unknown authored
        Added a test for bug #8615.
      sql_select.cc:
        Fixed bug #8615.
        This fix only removed the cause of the reported crash.
        It does not resolve other problems of rollup queries
        with DISTINCT. They were fixed in the previous patch 
        for bug 8616.
      
      
      sql/sql_select.cc:
        Fixed bug #8615.
        This fix only removed the cause of the reported crash.
        It does not resolve other problems of rollup queries
        with DISTINCT. They were fixed in the previous patch 
        for bug 8616.
      mysql-test/t/olap.test:
        Added a test for bug #8615.
      mysql-test/r/olap.result:
        Added a test for bug #8615.
      31f6b0dd
    • unknown's avatar
      Merge with global tree · b766082b
      unknown authored
      
      mysql-test/r/federated.result:
        merge
      sql/ha_federated.cc:
        merge
      b766082b
    • unknown's avatar
      Move handler dependent tests to the specific handler (myisam, bdb, innodb) · 1c5ca806
      unknown authored
      Enabled VARCHAR testing for innodb
      
      NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
      I have informed Heikki about this and expect him to fix this ASAP
      
      
      mysql-test/include/varchar.inc:
        Move handler dependent tests to the specific handler (myisam, bdb, innodb)
      mysql-test/r/innodb.result:
        Added varchar tests
      mysql-test/r/myisam.result:
        Update results
      mysql-test/t/bdb.test:
        Move handler dependent tests to the specific handler (myisam, bdb, innodb)
      mysql-test/t/innodb.test:
        Enabled VARCHAR testing
      mysql-test/t/myisam.test:
        Move handler dependent tests to the specific handler (myisam, bdb, innodb)
      sql/sql_parse.cc:
        Indentation fixes
      sql/sql_table.cc:
        Fixed bug introduced when doing cleanup
      1c5ca806
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 06f59b28
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/item_func.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      06f59b28
    • unknown's avatar
      Fixes after Sinisa and Serg comments after push of patch for BUG#9123. · 74007170
      unknown authored
      BUG#9123 is solved earlier than this patch though.
      
      
      74007170
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 61a717f6
      unknown authored
      into krsna.:/home/patg/test/mysql-5.0
      
      
      61a717f6
    • unknown's avatar
      Fixed binlog.test failure which occured after patch implementing · f9792042
      unknown authored
      WL#874 "Extended LOAD DATA" was pushed.
      
      
      mysql-test/r/binlog.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar
        changes.
      mysql-test/t/binlog.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar
        changes.
      f9792042
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · a97fd472
      unknown authored
      into krsna.:/home/patg/test/mysql-5.0
      
      
      a97fd472
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7fe43b71
      unknown authored
      into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
      
      
      7fe43b71
    • unknown's avatar
      Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.2 · 91df4830
      unknown authored
      into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      91df4830
    • unknown's avatar
      data0data.c: · 0c0b3ea9
      unknown authored
        Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing
      
      
      innobase/data/data0data.c:
        Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing
      0c0b3ea9
    • unknown's avatar
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · a3869dd8
      unknown authored
      into krsna.:/home/patg/test/mysql-5.0
      
      
      a3869dd8
    • unknown's avatar
      Small fix to innodb.test that Heikki probably simply forgot to commit. · 01774e96
      unknown authored
      
      mysql-test/r/innodb.result:
        Added proper cleanup after test.
      mysql-test/t/innodb.test:
        We don't expect error if we create varchar(16384) column in Innodb
        table anymore. (Heikki already removed error message from .result
        file.) Also we should do proper cleanup after the test.
      01774e96
    • unknown's avatar
      5be39a0c
    • unknown's avatar
      Add information to the log file written by 'Do-compile' that allows to calculate · 0f3b3d3a
      unknown authored
      the time spent in the various steps.
      
      
      Build-tools/Do-compile:
        Add information to the log file that allows to calculate the time spent in the
        various steps:
        
        1) Introduce a global variable 'global_step'.
        2) Before each major step, set it to some descriptive value.
        3) Expand the 'log_timestamp()' function to take a parameter (typical: "START",
           "DONE", or "ABORT") and append that to the timestamp in the log file,
           followed by the contents of 'global_step'.
        4) Add the "START" string as parameter to the 'log_timestamp' calls preceding a step.
        5) Add 'log_timestamp("DONE");' calls after the relevant steps.
        6) Add 'log_timestamp("ABORT");' calls to the error exits.
      0f3b3d3a
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 533d2187
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
      
      
      533d2187
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6bd23c18
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
      
      
      6bd23c18
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 05e25d04
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
      
      
      05e25d04
    • unknown's avatar
      Cleanup during reviews · 284b8b8b
      unknown authored
      Removed some optional arguments
      Fixed portability problem in federated tests
      
      
      client/sql_string.cc:
        update from sql/sql_string.cc
      client/sql_string.h:
        update from sql/sql_string.h
      mysql-test/r/federated.result:
        Fixed error message
      sql/field.cc:
        Cleanup during review
        Remove const in 'const unsigned int'
      sql/field.h:
        Remove const in 'const unsigned int'
      sql/ha_federated.cc:
        Better error string.  Add missing argument to error (before 'errno' was picked up from stack)
      sql/handler.cc:
        Removed compiler warning
      sql/item_func.cc:
        Cleanup during review
      sql/item_sum.cc:
        Cleanup during review
      sql/lock.cc:
        Remove optional arguments
      sql/log_event.cc:
        Remove optional arguments
      sql/mysql_priv.h:
        Remove optional arguments
        cahnge preapre_create_fields to use pointers instead of references
      sql/opt_range.cc:
        Fix arguments so that return value is last
      sql/sql_base.cc:
        Remove optional arguments
      sql/sql_delete.cc:
        Remove optional arguments
      sql/sql_error.cc:
        Remove optional arguments
      sql/sql_help.cc:
        Remove optional arguments
      sql/sql_parse.cc:
        Remove optional arguments
      sql/sql_prepare.cc:
        Remove optional arguments
      sql/sql_rename.cc:
        Remove optional arguments
      sql/sql_select.cc:
        Remove optional arguments
      sql/sql_show.cc:
        Cleanup during review
      sql/sql_string.cc:
        Simple optimization
      sql/sql_table.cc:
        Remove optional arguments
        Fixed indentation
      sql/sql_update.cc:
        Remove optional arguments
      sql/sql_yacc.yy:
        Change references to pointers
      284b8b8b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d5ec9ed8
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
      
      
      d5ec9ed8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 333fbf62
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      333fbf62
    • unknown's avatar
      Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 · bf79f362
      unknown authored
      into mysql.com:/home/bkroot/mysql-4.1
      
      
      bf79f362
    • unknown's avatar
      Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY() · b3a5e5b1
      unknown authored
      not always correct for NULL values.
      Now they always result a non NULL value even
      the argument is NULL. It is more usefull for 
      debugging purposes.
      
      
      mysql-test/r/func_str.result:
        Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
        not always correct for NULL values.
        
        Also, a mistake in EXPORT_SET was fixed.
      mysql-test/t/func_str.test:
        Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
        not always correct for NULL values.
      sql/item_func.cc:
        Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
        not always correct for NULL values.
      sql/item_strfunc.cc:
        Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
        not always correct for NULL values.
        
        A minor mistake in EXPORT_SET() was fixed.
      b3a5e5b1
    • unknown's avatar
      Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34b8db05
      unknown authored
      into mysql.com:/home/bkroot/mysql-4.1
      
      
      34b8db05
    • unknown's avatar
      Fix for bug#8656: Crash with group_concat on alias in outer table · a5c87958
      unknown authored
      fixed result_field support of Item_ref
      
      
      a5c87958
    • unknown's avatar
      Fix to get --skip-ndb to work · 36c35836
      unknown authored
      36c35836
    • unknown's avatar
      subselect2.result: · 8022fc82
      unknown authored
        Update key lengths in EXPLAIN to reflect true VARCHARs
      
      
      mysql-test/r/subselect2.result:
        Update key lengths in EXPLAIN to reflect true VARCHARs
      8022fc82