1. 17 Jul, 2006 1 commit
    • unknown's avatar
      "BUG #18764: Delete conditions causing inconsistencies in Federated tables" · 469813c7
      unknown authored
      Removed logic in ha_federated::write_row, which checks field query ids in the
      loop which builds the query to run on the remote server.
      
      
      mysql-test/r/federated.result:
        "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
        
        
        New test results for test that verifies that one can insert to rows using 
        "insert into... select * from..", delete 
        them by id, then immediately insert them in the same way they were originally 
        inserted.
      mysql-test/t/federated.test:
        "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
        
        
        New test that verifies that one can insert to rows using 
        "insert into... select * from..", delete 
        them by id, then immediately insert them in the same way they were originally 
        inserted.
      sql/ha_federated.cc:
        "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
        
        Removed the logic in ha_federated::write_row which checked the query id of 
        each field and compared it to the thread query id.
        
        Each field has a query id, and the problem used to be that if I did an insert
        no fields specified, the field value would contain the last inserted value 
        for that field. The way to work around this was to see if the query id for 
        that field was the same as the current query id or of the rest of the field 
        query ids. If it wasn't, that told me the query didn't have the field value 
        specified.
        
        Somewhere from when I wrote that code to now the problem went away, and there
        was no longer the need for this logic. 
        
        Also removed the bool "has_fields", which needs not exist and using 
        table->s->fields is sufficient.
      469813c7
  2. 06 Jul, 2006 13 commits
  3. 05 Jul, 2006 6 commits
  4. 04 Jul, 2006 9 commits
  5. 03 Jul, 2006 7 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 06af76d2
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      06af76d2
    • unknown's avatar
      Bug#20783: Valgrind uninitialised warning in test case ctype_uca · c3ef0267
      unknown authored
        
      Two functions have different ideas of what a string should look like;
      one of them reads memory it assumes the other one may have written.
      And "if you assume ..."
        
      We now use a more defensive variety of the assuming function, this fixes
      a warning thrown by the valgrind tool.
      
      
      sql/item_cmpfunc.cc:
        c_ptr() makes incorrect assumptions about the string we get from
        out of args[0]->val_str(&tmp); c_str_safe() is more defensive.
      c3ef0267
    • unknown's avatar
      client.c: · e34b9cfb
      unknown authored
        Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
      
      
      sql-common/client.c:
        Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
      e34b9cfb
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 3702ae2d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
      
      
      3702ae2d
    • unknown's avatar
      mwldnlm, mwccnlm, mwasmnlm: · 9ecc01a9
      unknown authored
        Use Perl for filtering, do more filtering
      
      
      netware/BUILD/mwasmnlm:
        Use Perl for filtering, do more filtering
      netware/BUILD/mwccnlm:
        Use Perl for filtering, do more filtering
      netware/BUILD/mwldnlm:
        Use Perl for filtering, do more filtering
      9ecc01a9
    • unknown's avatar
      Makefile.am: · 97c21888
      unknown authored
        Avoid duplicate symbol errors on Netware
      mwldnlm, mwccnlm, mwasmnlm:
        Filter garbage characters from output
      
      
      netware/BUILD/mwasmnlm:
        Filter garbage characters from output
      netware/BUILD/mwccnlm:
        Filter garbage characters from output
      netware/BUILD/mwldnlm:
        Filter garbage characters from output
      tests/Makefile.am:
        Avoid duplicate symbol errors on Netware
      97c21888
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3e085bd8
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      3e085bd8
  6. 01 Jul, 2006 4 commits
    • unknown's avatar
      mysqld.vcproj: · 84e72c2b
      unknown authored
        Don't define __NT__ for 'Max' target
      
      
      VC++Files/sql/mysqld.vcproj:
        Don't define __NT__ for 'Max' target
      84e72c2b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4c2db1be
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime
      
      
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_sapdb.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      4c2db1be
    • unknown's avatar
      my_sys.h: · 805e8554
      unknown authored
        Added missing parameter type change for _my_strdup_with_length()
      
      
      include/my_sys.h:
        Added missing parameter type change for _my_strdup_with_length()
      805e8554
    • unknown's avatar
      Post-merge fix · 047e2be2
      unknown authored
      047e2be2