1. 19 Jul, 2006 2 commits
  2. 18 Jul, 2006 1 commit
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-engines · cf722495
      unknown authored
      into  rama.(none):/home/jimw/my/mysql-5.0-17608
      
      
      include/my_base.h:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      cf722495
  3. 17 Jul, 2006 1 commit
    • unknown's avatar
      "BUG #18764: Delete conditions causing inconsistencies in Federated tables" · 4e06ba9f
      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.
      4e06ba9f
  4. 12 Jul, 2006 5 commits
    • unknown's avatar
      Bug #17608: String literals lost during INSERT query on FEDERATED table · 1f36d330
      unknown authored
        The Federated storage engine used Field methods that had arbitrary limits on
        the amount of data they could process, which caused problems with data
        over that limit (4K). By removing those Field methods and just using
        features of the String class, we can avoid this problem.
      
      
      mysql-test/r/federated.result:
        Add new results
      mysql-test/t/federated.test:
        Add new regression test
      sql/field.cc:
        Remove unnecessary methods
      sql/field.h:
        Remove unnecessary methods
      sql/ha_federated.cc:
        Remove use of quote_data, use String::print() to get escaping of strings,
        and don't bother with needs_quotes, just always quote values.
      1f36d330
    • unknown's avatar
      Fix a valgrind warning in type_date test. · b3180c89
      unknown authored
      
      sql/item_timefunc.cc:
        Fix a valgrind warning in type_date test.	
      b3180c89
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0 · 4136cfc3
      unknown authored
      into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl
      
      
      ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      4136cfc3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-engines · 417757db
      unknown authored
      into  rama.(none):/home/jimw/my/mysql-5.0-17766
      
      417757db
    • unknown's avatar
      Bug #17766: The server accepts to create MERGE tables which cannot work · 60cb997c
      unknown authored
       Changed the error reporting (and a crash) when inserting data into a
       MERGE table that has no underlying tables or no INSERT_METHOD specified
       by reporting that it is read-only.
      
      
      include/my_base.h:
        Add new handler error
      mysql-test/r/merge.result:
        Update results
      mysql-test/t/merge.test:
        Add new regression test
      sql/ha_myisammrg.cc:
        When trying to insert into a MERGE table with no underlying tables
        or no INSERT_METHOD, report that it is read-only.
      sql/handler.cc:
        Handle new error message
      60cb997c
  5. 11 Jul, 2006 6 commits
  6. 10 Jul, 2006 21 commits
  7. 09 Jul, 2006 2 commits
    • unknown's avatar
      BUG#20919 temp tables closing fails when binlog is off · 259ab342
      unknown authored
      closing temp tables through end_thread
      had a flaw in binlog-off branch of close_temporary_tables where
      next table to close was reset via table->next
       for (table= thd->temporary_tables; table; table= table->next)
      which was wrong since the current table instance got destoyed at
      	close_temporary(table, 1);
      
      The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.
      
      
      
      sql/sql_base.cc:
        no-binlog branch is fixed: scanning across temporary_tables must be careful to save next table since the current is being destroyed inside of close_temporary. 
        binlog-is-open case is ok.
      259ab342
    • unknown's avatar
      Fix compiler warnings in sql_udf.h: ISO C++ forbids casting · 42ec208d
      unknown authored
      between pointer to function and pointer to object.
      
      
      sql/item_func.cc:
        Use typedef names instead of hard-coded types for udf init/deinit
        functions.
      sql/sql_udf.cc:
        Use typedef names for udf function types.
      42ec208d
  8. 08 Jul, 2006 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2a6f7ede
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
      
      
      myisam/mi_create.c:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      mysql-test/r/federated.result:
        Manual merge.
      mysql-test/t/federated.test:
        Manual merge.
      2a6f7ede
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0--main · bc114e9f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-amerge
      
      bc114e9f