1. 14 Sep, 2006 1 commit
  2. 13 Sep, 2006 11 commits
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix · 2dd39f52
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      2dd39f52
    • unknown's avatar
      These bitKeeper changes will allow Windows to be used as a primary development platform. · e90f2c4f
      unknown authored
      
      BitKeeper/etc/ignore:
        Exclude files created during the Windows build process.
      BitKeeper/triggers/post-commit:
        post-commit trigger writes emails to file in the BitKeeper/tmp directory before sending in case of failure.
        Now uses bk sendmail instead of hardcoded /usr/sbin/sendmail to send message.
      e90f2c4f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 550b2956
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      
      550b2956
    • unknown's avatar
      Bug #21618: NULL shown as empty string in client · 306827a5
      unknown authored
      The column's NOT NULL flag doesn't affect what we should print.  Remove the
      wrong logic that does check it.
      
      Also, verify that this and the previous two tests print the same data as 
      other output formats.
      
      
      client/mysql.cc:
        Don't check the column's NOT NULL flag when determining whether to print 
        "NULL" or not.
      mysql-test/r/mysql.result:
        Add results and confirm that the other output forms give the same results
        for other similar tests.
      mysql-test/t/mysql.test:
        Add regression tests for this bug and two similar bugs.
      306827a5
    • unknown's avatar
      Fixed the faulty merge · 12bc3c37
      unknown authored
      12bc3c37
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · bd3ed007
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      bd3ed007
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0--windows-vio-uninit · 3cfbb918
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      vio/viosocket.c:
        Auto merged
      3cfbb918
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my50-bug15583 · 0ca3700e
      unknown authored
      into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
      
      
      sql/item_strfunc.cc:
        Auto merged
      0ca3700e
    • unknown's avatar
      Merge polly.local:/tmp/20924/bug20294/my50-bug20294 · a5a9b980
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/r/user_var.result:
        Manual merge
      mysql-test/t/user_var.test:
        Manual merge
      sql/item_func.cc:
        Manual merge
      sql/item_func.h:
        Manual merge
      a5a9b980
    • unknown's avatar
      Merge polly.local:/tmp/20924/bug20294/my41-bug20294 · b419501e
      unknown authored
      into  polly.local:/tmp/20924/bug20294/my50-bug20294
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/r/case.result:
        Manual merge
      mysql-test/r/func_if.result:
        Manual merge
      mysql-test/r/func_test.result:
        Manual merge
      mysql-test/r/user_var.result:
        Manual merge
      mysql-test/t/case.test:
        Manual merge
      mysql-test/t/func_if.test:
        Manual merge
      mysql-test/t/func_test.test:
        Manual merge
      mysql-test/t/user_var.test:
        Manual merge
      sql/item_func.cc:
        Manual merge
      b419501e
    • unknown's avatar
      Cset exclude: kaa@polly.local|ChangeSet|20060912122540|09861 · 418ae41b
      unknown authored
      Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983
      
      
      sql/item_cmpfunc.cc:
        Exclude
      sql/item_cmpfunc.h:
        Exclude
      sql/item_func.cc:
        Exclude
      sql/item_func.h:
        Exclude
      sql/log_event.cc:
        Exclude
      sql/sql_class.h:
        Exclude
      mysql-test/r/case.result:
        Exclude
      mysql-test/r/func_if.result:
        Exclude
      mysql-test/r/func_test.result:
        Exclude
      mysql-test/r/user_var.result:
        Exclude
      mysql-test/t/case.test:
        Exclude
      mysql-test/t/func_if.test:
        Exclude
      mysql-test/t/func_test.test:
        Exclude
      mysql-test/t/user_var.test:
        Exclude
      418ae41b
  3. 12 Sep, 2006 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 9f80b604
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      
      sql/item_func.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      9f80b604
    • unknown's avatar
      Merge polly.local:/tmp/20924/bug20294/my50-bug20294 · 76f18d7f
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/r/user_var.result:
        Manual merge
      mysql-test/t/user_var.test:
        Manual merge
      sql/item_func.cc:
        Manual merge
      sql/item_func.h:
        Manual merge
      76f18d7f
    • unknown's avatar
      Fixed compilation · d31a3434
      unknown authored
      d31a3434
    • unknown's avatar
      Merge polly.local:/tmp/20924/bug20294/my41-bug20294 · db141b6b
      unknown authored
      into  polly.local:/tmp/20924/bug20294/my50-bug20294
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/r/case.result:
        Manual merge
      mysql-test/r/func_if.result:
        Manual merge
      mysql-test/r/func_test.result:
        Manual merge
      mysql-test/r/user_var.result:
        Manual merge
      mysql-test/t/case.test:
        Manual merge
      mysql-test/t/func_if.test:
        Manual merge
      mysql-test/t/func_test.test:
        Manual merge
      mysql-test/t/user_var.test:
        Manual merge
      sql/item_func.cc:
        Manual merge
      db141b6b
    • unknown's avatar
      Post-review fixes for bug #20924 · 5aa6e861
      unknown authored
      
      mysql-test/r/case.result:
        Post-review fix for bug #20924
      mysql-test/r/func_if.result:
        Post-review fix for bug #20924
      mysql-test/r/func_test.result:
        Post-review fix for bug #20924
      mysql-test/r/user_var.result:
        Post-review fix for bug #20924
      mysql-test/t/case.test:
        Post-review fix for bug #20924
      mysql-test/t/func_if.test:
        Post-review fix for bug #20924
      mysql-test/t/func_test.test:
        Post-review fix for bug #20924
      mysql-test/t/user_var.test:
        Post-review fix for bug #20924
      sql/item_func.cc:
        Post-review fix for bug #20924
      sql/item_func.h:
        Post-review fix for bug #20924
      sql/log_event.cc:
        Post-review fix for bug #20924
      5aa6e861
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/tmp_merge · 2214e282
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Null merge backported changes
      mysql-test/lib/mtr_cases.pl:
        Null merge backported changes
      mysql-test/lib/mtr_match.pl:
        Auto merged
      mysql-test/lib/mtr_misc.pl:
        Null merge backported changes
      mysql-test/r/ctype_ucs.result:
        SCCS merged
      mysql-test/t/ctype_ucs.test:
        Null merge, fixed in 5.0 already
      BUILD/SETUP.sh:
        Merge
      mysql-test/r/myisam.result:
        Merge
      mysql-test/t/myisam.test:
        Merge
      support-files/mysql.spec.sh:
        Merge
      tests/mysql_client_test.c:
        Merge
      2214e282
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · c4812a0a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      c4812a0a
  4. 08 Sep, 2006 4 commits
    • unknown's avatar
      Fix initialized memory. Count the number of failures in shm-closing · e44a9232
      unknown authored
      functions and return it.
      
      
      vio/viosocket.c:
        Initialize the return code and set it according to errors in the closing 
        functions.
      e44a9232
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3fa0f96b
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      3fa0f96b
    • unknown's avatar
      after merge fix · 4ef211ee
      unknown authored
      
      sql/mysql_priv.h:
        after merge fix
        added charset parameter to check_string_length() function
      sql/slave.h:
        after merge fix
        USERNAME_LENGTH const is changed to USERNAME_BYTE_LENGTH
      sql/sql_parse.cc:
        after merge fix
        added charset parameter to check_string_length() function
      sql/sql_yacc.yy:
        after merge fix
        added charset parameter to check_string_length() function
      4ef211ee
    • unknown's avatar
      Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions · f64483cb
      unknown authored
      - Honor unsigned_flag in the corresponding functions
      - Use compare_int_signed_unsigned()/compare_int_unsigned_signed() instead of explicit comparison in GREATEST() and LEAST()
      
      
      mysql-test/r/case.result:
        Added test case for bug #20924
      mysql-test/r/func_if.result:
        Added test case for bug #20924
      mysql-test/r/func_test.result:
        Added test case for bug #20924
      mysql-test/r/user_var.result:
        Added test case for bug #20924
      mysql-test/t/case.test:
        Added test case for bug #20924
      mysql-test/t/func_if.test:
        Added test case for bug #20924
      mysql-test/t/func_test.test:
        Added test case for bug #20924
      mysql-test/t/user_var.test:
        Added test case for bug #20924
      sql/item_cmpfunc.cc:
        Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
        
        - Moved some code out of Arg_comparator to external functions to be reused in Item_func_min_max
        - Fixed IFNULL(), IF(), CASE() and COALESCE()
      sql/item_cmpfunc.h:
        Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
        
        - Moved some code out of Arg_comparator to external functions to be reused in Item_func_min_max
      sql/item_func.cc:
        Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
        
        Fixed LEAST(), GREATEST() and "SET @A=..." parts
      sql/item_func.h:
        Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
        
        Fixed "SET @A=..." part
      sql/sql_class.h:
        Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
        
        Fixed "SET @A=..." part
      f64483cb
  5. 07 Sep, 2006 5 commits
    • unknown's avatar
      configure.in : NDB version and general version must be (kept) in sync - do that. · e1a70926
      unknown authored
      
      configure.in:
        NDB version and general version must be (kept) in sync - do that.
      e1a70926
    • unknown's avatar
      Merge trift2.:/M50/clone-5.0 · 2d35bd61
      unknown authored
      into  trift2.:/M50/push-5.0
      
      
      configure.in:
        Auto merged
      2d35bd61
    • unknown's avatar
      Fix a change to "configure.in" that broke building commercial sources. · b179cf8f
      unknown authored
      To be pushed to both the cloned 5.0.25 and the general 5.0 tree.
      
      
      configure.in:
        When creating "commercial" sources, this file gets modified by "mysql-copyright".
        For this, it is essential that the string 'cmd-line-utils/readline/Makefile'
        be alone on its line ...
      b179cf8f
    • unknown's avatar
      after merge fix · dc6243e5
      unknown authored
      
      include/mysql_com.h:
        USERNAME_LENGTH is changed to USERNAME_BYTE_LENGTH
      mysql-test/r/ctype_utf8.result:
        result fix
      mysql-test/t/ctype_utf8.test:
        test fix
      sql/sp.cc:
        NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
        USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer
      sql/sp_head.cc:
        NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
        USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer
      sql/sql_acl.cc:
        NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
        USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer
      sql/sql_class.h:
        NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
      sql/sql_parse.cc:
        NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
        Function check_string_length() is fixed, now it check string lenght in symbols
      sql/sql_repl.h:
        NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
        USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer
      dc6243e5
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge · 146049d2
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      include/mysql_com.h:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        manual merge
      sql/sql_acl.cc:
        manual merge
      146049d2
  6. 06 Sep, 2006 8 commits
  7. 05 Sep, 2006 1 commit
    • unknown's avatar
      Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0". · a0b7b242
      unknown authored
      In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
      only NDB wanted that. Users and trainers complained that it affected
      InnoDB and was a change compared to 4.1 where only NDB autocommitted.
      To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
      ha_ndbcluster::external_lock().
      The result is that LOAD DATA INFILE commits all uncommitted changes
      of NDB if this is an NDB table, its own changes if this is an NDB
      table, but does not affect other engines.
      Note: even though there is no "commit the full transaction at end"
      anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
      problems per a comment of Pem).
      Note: ha_ndbcluster::has_transactions() does not give reliable results
      because it says "yes" even if transactions are disabled in this engine...
      
      
      sql/ha_ndbcluster.cc:
        NDB wants to do autocommit if this is LOAD DATA INFILE.
        For this to not affect all other engines, we move the logic
        inside ha_ndbcluster.
      sql/sql_load.cc:
        This ha_enable_transaction() in mysql_load() forced an autocommit
        in all engines, while only NDB wants to do that.
        So we move the logic inside ha_ndbcluster.cc.
      mysql-test/include/loaddata_autocom.inc:
        test for engines to see if they autocommit or not in LOAD DATA INFILE
      mysql-test/r/loaddata_autocom_innodb.result:
        result for InnoDB (no autocommit)
      mysql-test/r/loaddata_autocom_ndb.result:
        result for NDB (autocommit)
      mysql-test/r/rpl_ndb_innodb_trans.result:
        result for InnoDB+NDB transactions. Observe that when ROLLBACK
        cannot rollback the LOAD DATA INFILE in NDB it issues warning 1196
        as appropriate.
      mysql-test/t/loaddata_autocom_innodb.test:
        test that InnoDB does not autocommit in LOAD DATA INFILE.
      mysql-test/t/loaddata_autocom_ndb.test:
        test that NDB does autocommit in LOAD DATA INFIL
      mysql-test/t/rpl_ndb_innodb_trans-slave.opt:
        need to tell the slave to use innodb
      mysql-test/t/rpl_ndb_innodb_trans.test:
        test of transactions mixing NDB and InnoDB. To see if ROLLBACK
        rolls back in both engines, with the exception of LOAD DATA INFILE
        which does not roll back NDB: we see that a LOAD DATA INFILE in NDB
        commits all what has been done in NDB so far, commits its changes,
        but does not commit in other engines.
      a0b7b242
  8. 04 Sep, 2006 3 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 6f843c13
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      sql/log.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      6f843c13
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 14bebaa2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      sql/log.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_repl.cc:
        merge
      14bebaa2
    • unknown's avatar
      bug#21965 - replication · d2d605e4
      unknown authored
        fix deadlock if master switches log file in parallell with "show master logs"
        
      
      
      sql/log.cc:
        add raw_get_current_log which dont take log mutex
      sql/sql_class.h:
        add raw_get_current_log which dont take log mutex
      sql/sql_repl.cc:
        Fix lock order i.e first log_lock then index_lock
      d2d605e4