1. 07 Feb, 2005 1 commit
  2. 05 Feb, 2005 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8d7c6cf4
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      8d7c6cf4
    • unknown's avatar
      Fixed bug detected by sp-tests · f2b88748
      unknown authored
      Cleanup during reviews of new pushed code
      
      
      BUILD/compile-pentium-debug-max:
        Use --debug=full as default
      BUILD/compile-pentium-debug:
        Use --debug=full as default
      mysys/my_alloc.c:
        More debugging
      sql/item_func.cc:
        Cleanup new code
        Don't call insert_id() for last_insert_id(value) to avoid side effects
      sql/item_subselect.cc:
        Fixed DBUG output
      sql/sp_head.cc:
        Simple cleanup
      sql/sql_lex.cc:
        Moved usage of arguments first in lex_start to make their usage clearer
        Remove sl->expr_list.deleete_elements() becasue:
        - It didn't do anything (delete_elements on a list of list is a no-op operation)
        - The deleted for loop used SELECT_LEX elements that was allocated in mysql_new_select() in sp-head, but freed
        when sphead->mem_root was freed. (delete sphead doesn't remove used SELECT_LEX elements from the global all_selects_list)
      sql/sql_parse.cc:
        More DBUG entries
      f2b88748
  3. 04 Feb, 2005 27 commits
    • unknown's avatar
      Merge mysql.com:/home/psergey/mysql-4.1-bug7816 · 4efe166c
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug7716
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/sql_string.h:
        Auto merged
      4efe166c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 197298dc
      unknown authored
      into mysql.com:/home/mysqldev/tulin/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/ha_ndbcluster.cc:
        Auto merged
      197298dc
    • unknown's avatar
      mysql-test-run.sh: · 50162a29
      unknown authored
        USE_RUNNING_SERVER should be set to 0 or 1
      
      
      mysql-test/mysql-test-run.sh:
        USE_RUNNING_SERVER should be set to 0 or 1
      50162a29
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5b9a4fad
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-5.0
      
      5b9a4fad
    • unknown's avatar
      Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 · 91e9c84a
      unknown authored
      into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/ha_innodb.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      91e9c84a
    • unknown's avatar
      Updated after review. · 2b1d22c9
      unknown authored
      
      sql/ha_ndbcluster.cc:
        Fixing spaces in parameter list.
      2b1d22c9
    • unknown's avatar
      InnoDB: A small cleanup: remove two duplicate rec_get_offsets() calls · 4f0d64c6
      unknown authored
      
      innobase/page/page0cur.c:
        Remove two duplicate rec_get_offsets() calls
      4f0d64c6
    • unknown's avatar
      ha_ndbcluster.cc: · 53ca9c47
      unknown authored
        fixed change in struct in 4.1->5.0 merge
      
      
      sql/ha_ndbcluster.cc:
        fixed change in struct in 4.1->5.0 merge
      53ca9c47
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 4e561f78
      unknown authored
      into mysql.com:/home/mysqldev/tulin/mysql-5.0
      
      4e561f78
    • unknown's avatar
      resolved merge conflict · 55f6017e
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/sql_yacc.yy:
        Auto merged
      ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      55f6017e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 96c8f4f0
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      96c8f4f0
    • unknown's avatar
      added test to trigger drifferent fragmentations in ndb · 6dabd8e5
      unknown authored
          corrected documentation on fragmentation
          set "fragmentation medium" to mean 2 fragments per node instead of 1
          set default fragmentation to small instead of medium
          bug#8284 adjust fragmentation to max_rows
      
      
      mysql-test/r/ndb_basic.result:
        added test to trigger drifferent fragmentations in ndb
      mysql-test/t/ndb_basic.test:
        added test to trigger drifferent fragmentations in ndb
      ndb/include/ndbapi/NdbDictionary.hpp:
        corrected documentation on fragmentation
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        set "fragmentation medium" to mean 2 fragments per node instead of 1
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        set default fragmentation to small instead of medium
      sql/ha_ndbcluster.cc:
        bug#8284 adjust fragmentation to max_rows
      6dabd8e5
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · a317582d
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      a317582d
    • unknown's avatar
      Proposal to fix this problem: when using libmysqlclient, you must call... · e5e1758b
      unknown authored
      Proposal to fix this problem: when using libmysqlclient, you must call mysql_server_end() to nicely free memory at the end of your program; it however
      sounds weird to call a function named *SERVER_end* when you're the CLIENT (you're not ending the server, you're ending your ability to talk to servers).
      So here I add two defines which should be more generic names. This was longly discussed with Konstantin, Serg, Brian. The problem started from
      a post on valgrind-users list: http://sourceforge.net/mailarchive/forum.php?thread_id=5778035&forum_id=32038 ; our manual mentions these functions
      only for libmysqld API so needs some fixing, and then we can close BUG#8099 and BUG#6149.
      
      
      include/mysql.h:
        Creating synonyms (defines): mysql_library_init for mysql_server_init, mysql_library_end for mysql_server_end;
        these new names are more generic, so suitable when using libmysqlclient as well as libmysqld.c
      e5e1758b
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6066c0b9
      unknown authored
      into mysql.com:/usr/home/ram/work/4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      6066c0b9
    • unknown's avatar
      type_float.result.es updated. · 3d04178b
      unknown authored
      
      mysql-test/r/type_float.result.es:
        Updated.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      3d04178b
    • unknown's avatar
      Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1 · fbd9a6f8
      unknown authored
      into mysql.com:/home/timka/mysql/src/4.1-virgin
      
      fbd9a6f8
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6189d8c7
      unknown authored
      into mysql.com:/usr/home/ram/work/5.0
      
      6189d8c7
    • unknown's avatar
      type_ranges.result.es updated. · f4cf92f7
      unknown authored
      
      mysql-test/r/type_ranges.result.es:
        Updated.
      f4cf92f7
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl · d407bf4a
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
      
      d407bf4a
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/4.1-dbg · b1e30aa8
      unknown authored
      into mysql.com:/home/timka/mysql/src/4.1-bug-8023
      
      b1e30aa8
    • unknown's avatar
      Merge of query cache from 4.1 to 5.0 · da440a0b
      unknown authored
      
      mysql-test/r/ndb_cache.result:
        Added 'order by' to select's
      mysql-test/r/ndb_cache2.result:
        Added 'order by' to select's
      mysql-test/t/ndb_cache.test:
        Added 'order by' to select's
      mysql-test/t/ndb_cache2.test:
        Added 'order by' to select's
      sql/ha_innodb.h:
        Changed function name
      sql/ha_ndbcluster.cc:
        Merge from query cache from 4.1 to 5.0
        Added better comments
        ndb_get_table_statistics had changed, so there where some adaptions to make
      sql/ha_ndbcluster.h:
        Changed name of function
      sql/handler.h:
        Changed name of function
      sql/sql_cache.cc:
        Changed name of function
      da440a0b
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · cab42409
      unknown authored
      into mysql.com:/usr/home/ram/work/5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      cab42409
    • unknown's avatar
      type_float.result.es updated · 869b1a43
      unknown authored
      
      mysql-test/r/type_float.result.es:
        Updated.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      869b1a43
    • unknown's avatar
      Merge · 153c2113
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/item_func.cc:
        Auto merged
      ndb/src/common/util/NdbSqlUtil.cpp:
        merge
      153c2113
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · a7e02476
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      a7e02476
    • unknown's avatar
      Fix for BUG#7716: in in_string::set() take into account that the value returned · e8acfe21
      unknown authored
      by item->val_str() may be a substring of the passed string. 
      Disallow string=its_substring assignment in String::operator=().
      
      
      mysql-test/r/func_misc.result:
        Testcase for BUG#7716
      mysql-test/t/func_misc.test:
        Testcase for BUG#7716
      sql/item_cmpfunc.cc:
        Fix for BUG#7716: in in_string::set() take into account that the string returned 
        by item->val_str(S) may be not S but use the buffer owned by S.
      sql/sql_string.h:
        * Added assert: String& String::operator=(const String&) may not be used to do 
          assignments like str = string_that_uses_buffer_owned_by_str
        * Added String::uses_buffer_owned_by().
      e8acfe21
  4. 03 Feb, 2005 10 commits