1. 13 Jul, 2006 1 commit
    • unknown's avatar
      Bug#21014: Segmentation fault of mysqldump on view · f27e9254
      unknown authored
      mysqldump did not select the correct database before trying to dump
      views from it. this resulted in an empty result set, which in turn
      startled mysql-dump into a core-dump.  this only happened for views,
      not for tables, and was only visible with multiple databases that
      weren't by sheer luck in the order mysqldump required, anyway. this
      fixes by selecting the correct database before dumping views; it also
      catches the empty set-condition if it should occur for other reasons.
      
      
      client/mysqldump.c:
        Bug#21014: Segmentation fault of mysqldump on view
        
        failsafe: if "select ... from information_schema.views" returns an
        empty set, don't deref NULL; throw an error instead.
        
        fix: select the correct database not only before dumping tables, but
        before dumping views, as well.
      mysql-test/r/mysqldump.result:
        Bug#21014: Segmentation fault of mysqldump on view
        
        show that mysqldump selects the correct database before trying to dump
        views from it.
      mysql-test/t/mysqldump.test:
        Bug#21014: Segmentation fault of mysqldump on view
        
        show that mysqldump selects the correct database before trying to dump
        views from it.
      f27e9254
  2. 12 Jul, 2006 2 commits
    • unknown's avatar
      Fix a valgrind warning in type_date test. · a7dddd3b
      unknown authored
      
      sql/item_timefunc.cc:
        Fix a valgrind warning in type_date test.	
      a7dddd3b
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0 · a08a6f9f
      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
      a08a6f9f
  3. 11 Jul, 2006 6 commits
  4. 10 Jul, 2006 21 commits
  5. 09 Jul, 2006 2 commits
    • unknown's avatar
      BUG#20919 temp tables closing fails when binlog is off · 868fee4d
      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.
      868fee4d
    • unknown's avatar
      Fix compiler warnings in sql_udf.h: ISO C++ forbids casting · 46079624
      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.
      46079624
  6. 08 Jul, 2006 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cad24c09
      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.
      cad24c09
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0--main · e6f010b6
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-amerge
      
      
      e6f010b6
    • unknown's avatar
      A post-merge fix. · e1f3149c
      unknown authored
      e1f3149c
  7. 07 Jul, 2006 5 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · 60b7f9d6
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
      
      
      BitKeeper/etc/ignore:
        auto-union
      libmysqld/Makefile.am:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      mysql-test/r/myisam.result:
        Manual merge.
      mysql-test/t/myisam.test:
        Manual merge.
      sql/set_var.cc:
        Manual merge.
      sql/set_var.h:
        Manual merge.
      sql/sql_cache.cc:
        Manual merge.
      sql/sql_class.cc:
        Manual merge.
      60b7f9d6
    • unknown's avatar
      Cleanups: ignore more files. · e9775dd8
      unknown authored
      
      BitKeeper/etc/ignore:
        Modify ignore list to work with BitKeeper 4
      mysql-test/t/mysqldump.test:
        Fix the test for Bug#18462 to use MYSQLTEST_VARDIR instead of mysql-test/
        directory for temporary files.
      e9775dd8
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-root · f5340f8c
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/sql_update.cc:
        Manual merge.
      f5340f8c
    • unknown's avatar
      Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847 · 8de29d3a
      unknown authored
      into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847
      
      
      BitKeeper/etc/config:
        auto
      ndb/src/kernel/blocks/ERROR_codes.txt:
        manual
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        SCCS merged
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        SCCS merged
      ndb/test/ndbapi/testDict.cpp:
        SCCS merged
      ndb/test/run-test/daily-basic-tests.txt:
        SCCS merged
      sql/opt_range.cc:
        SCCS merged
      8de29d3a
    • unknown's avatar
      ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies · 2c48aaa1
      unknown authored
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        DbtupTabDesMan: add merge with left buddies
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        DbtupTabDesMan: add merge with left buddies
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        DbtupTabDesMan: add merge with left buddies
      ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
        DbtupTabDesMan: add merge with left buddies
      ndb/test/ndbapi/testDict.cpp:
        DbtupTabDesMan: add merge with left buddies
      ndb/test/run-test/daily-basic-tests.txt:
        DbtupTabDesMan: add merge with left buddies
      2c48aaa1