1. 13 Sep, 2006 2 commits
  2. 12 Sep, 2006 3 commits
    • unknown's avatar
      Fix for BUG#21774: Column count doesn't match value count at row x · 900e66f8
      unknown authored
      The cause of the bug was an incomplete fix for bug 18080.
      The problem was that setup_tables() unconditionally reset the
      name resolution context to its 'tables' argument, which pointed
      to the first table of an SQL statement.
      
      The bug fix limits resetting of the name resolution context in
      setup_tables() only in the cases when the context was not set
      by earlier parser/optimizer phases.
      
      
      mysql-test/r/insert_select.result:
        Test for BUG#21774.
      mysql-test/t/insert_select.test:
        Test for BUG#21774.
      sql/sql_base.cc:
        Do not reset the name resolution contect unconditionally.
        Instead set the context to 'tables' only if it was not
        set before calling setup_tables().
      sql/sql_insert.cc:
        Added asserts to make sure that in the case of INSERT ... VALUES ...
        statements it is not necessary to reset the name resolution context
        to the first table, because there is only one table in the list of
        tables anyway. The actual code is not removed in order not to
        confuse it with the actual bug fix.
      sql/sql_parse.cc:
        Removed unnecessary reset of the name resolution context.
        The context is anyway unconditionally reset in mysql_insert()
        and mysql_prepare_insert().
      900e66f8
    • 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
  3. 11 Sep, 2006 1 commit
  4. 08 Sep, 2006 4 commits
  5. 07 Sep, 2006 6 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
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 82ad4ae1
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      
      82ad4ae1
  6. 06 Sep, 2006 10 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 11 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
    • unknown's avatar
      Merge dl145s:/data/tkatchaounov/5.0-bug-21787 · eb0cc3bf
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      eb0cc3bf
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 4cd43a1a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      4cd43a1a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · 259689f8
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      259689f8
    • unknown's avatar
      Fix problem where mysql-test-run.pl fails to start up the mysqld after a... · 3dd1ef7b
      unknown authored
      Fix problem where mysql-test-run.pl fails to start up the mysqld after a failed test. Shows up on win hosts where one failed test case make subsequent ones fails with error "Could not open connection 'default': 2003 Can't connect to MySQL server on 'localhost'" 
      
      
      mysql-test/lib/mtr_process.pl:
        Reset the associated "pid" of masters and slave when building the list of processes to shutdown.
      3dd1ef7b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-cmake · b4401f8a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      b4401f8a
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 2ed26cd7
      unknown authored
      into  maint1.mysql.com:/data/localhome/tnurnberg/my50-21913
      
      
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      2ed26cd7
    • unknown's avatar
      Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913 · 8ce43f8d
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913
      
      21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
      
      Variable character_set_results can legally be NULL (for "no conversion.")
      This could result in a NULL deref that crashed the server.  Fixed.
      
      (Although ran some additional precursory tests to see whether I could break
      anything else, but no breakage so far.)
      
      
      mysql-test/r/func_time.result:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Prove DATE_FORMAT() no longer crashes the server when character_set_results is
        NULL (which is a legal value and means, "no conversion").
      mysql-test/t/func_time.test:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Prove DATE_FORMAT() no longer crashes the server when character_set_results is
        NULL (which is a legal value and means, "no conversion").
      sql/sql_string.cc:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare
        because it is magic for, "no conversion."
      8ce43f8d
    • unknown's avatar
      Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. · 61718995
      unknown authored
      Variable character_set_results can legally be NULL (for "no conversion.")
      This could result in a NULL deref that crashed the server.  Fixed.
      
      (Although ran some additional precursory tests to see whether I could break
      anything else, but no breakage so far.)
      
      
      mysql-test/r/func_time.result:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Prove DATE_FORMAT() no longer crashes the server when character_set_results is
        NULL (which is a legal value and means, "no conversion").
      mysql-test/t/func_time.test:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Prove DATE_FORMAT() no longer crashes the server when character_set_results is
        NULL (which is a legal value and means, "no conversion").
      sql/sql_string.cc:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare
        because it is magic for, "no conversion."
      61718995
  9. 03 Sep, 2006 1 commit
  10. 02 Sep, 2006 1 commit