1. 10 Feb, 2005 1 commit
  2. 07 Feb, 2005 8 commits
  3. 06 Feb, 2005 4 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 16eb7e7b
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
      
      
      16eb7e7b
    • unknown's avatar
      fixed test 'subselect' in case when innodb is not compiled in (thanks HF who niticed it) · 3455bc53
      unknown authored
      
      mysql-test/r/subselect.result:
        test depends on innodb moved from 'subselect' to 'subselect_innodb'
      mysql-test/r/subselect_innodb.result:
        test depends on innodb moved from 'subselect' to 'subselect_innodb'
      mysql-test/t/subselect.test:
        test depends on innodb moved from 'subselect' to 'subselect_innodb'
      mysql-test/t/subselect_innodb.test:
        test depends on innodb moved from 'subselect' to 'subselect_innodb'
      3455bc53
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · d0f71a11
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      d0f71a11
    • unknown's avatar
      bug8262 - ndb · 37b4b89e
      unknown authored
        crash if scan is poped from queue before all attrinfo has arrived
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        only restart scan if all attrinfo has arrived
        otherwise just set remove from queue and set state
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        new error insert - force send attrinfo
      ndb/test/ndbapi/testScan.cpp:
        new test bug8262 many threads - scanning small tables
      ndb/test/run-test/daily-basic-tests.txt:
        run new test case in autotest
      37b4b89e
  4. 05 Feb, 2005 2 commits
  5. 04 Feb, 2005 25 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · a27e68a8
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug7816
      
      
      a27e68a8
    • unknown's avatar
      A fix for Bug#6273 "building fails on link": we should not use · fe83a193
      unknown authored
      CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when
      we use the bundled zlib.
      
      
      acinclude.m4:
        Extend MYSQL_CHECK_ZLIB_WITH_COMPRESS m4 macro to substitute ZLIB_DEPS -
        this is a special version of ZLIB_LIBS to use in mysql_config
      configure.in:
        Remove NON_THREADED_CLIENT_LIBS which weren't really 
        NON_THREADED_CLIENT_LIBS and use NON_THREADED_LIBS instead.
        AC_SUBST NON_THREADED_LIBS and STATIC_NSS_FLAGS as they're now
        needed inside mysql_config.sh
      scripts/Makefile.am:
        Add STATIC_NSS_FLAGS, NON_THREADED_LIBS and ZLIB_DEPS to sed 
        substitution list.
      scripts/mysql_config.sh:
        We can't use CLIENT_LIBS as in case when we use the bundled zlib
        it has a reference to $(top_builddir)/zlib.
        libs and libs_r now need to be specified explicitly.
      zlib/Makefile.am:
        Install libz.la in case it's used by MySQL: this way we guarantee
        that paths printed by mysql_config are valid in all cases.
      fe83a193
    • unknown's avatar
      Backport of ChangeSet 1.1845 05/02/04 13:53:16 guilhem@mysql.com +1 -0 from 5.0. · 987e620d
      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. 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.
      987e620d
    • unknown's avatar
      Fix for BUG#8055 "Trouble with replication from temporary tables and ignores": · ededf831
      unknown authored
      when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*.
      
      
      mysql-test/r/drop_temp_table.result:
        result update (note: one DROP TEMPORARY TABLE per tmp table)
      mysql-test/t/drop_temp_table.test:
        checking that we have one DROP TEMPORARY TABLE per tmp table now, not one multi-table DROP.
        Hiding columns Log_pos/End_log_pos per Monty's request.
      sql/sql_base.cc:
        When we close the session's temp tables at session end, we automatically write to binlog one DROP TEMPORARY TABLE per tmp table, 
        not one single multi-table DROP TEMPORARY TABLE (because it causes problems if slave has --replicate*table rules).
      ededf831
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-8029 · 2f911184
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      2f911184
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-6067 · 38114e1c
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/field.cc:
        Auto merged
      38114e1c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · affcdef0
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      affcdef0
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 73ad0fe4
      unknown authored
      into mysql.com:/home/mysqldev/tulin/mysql-4.1
      
      
      73ad0fe4
    • unknown's avatar
      Merge Bug#7310 from 4.0 · ee838b0b
      unknown authored
      ee838b0b
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · b39c0367
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      b39c0367
    • unknown's avatar
      Embedded version of test fixed · 8ed40c4b
      unknown authored
      
      mysql-test/r/insert_select.result.es:
        Test.es fixed
      8ed40c4b
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 386297dc
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/item_func.cc:
        Auto merged
      386297dc
    • unknown's avatar
      indexless boolean fulltext search was depending on default_charset_info - Bug#8159 · 8c750c46
      unknown authored
      ftbw->off wasn't cleared on reinit - Bug#8234
      
      
      include/ft_global.h:
        get rid of default_charset_info in indexless fulltext searches
      myisam/ft_boolean_search.c:
        get rid of default_charset_info in indexless fulltext searches
        clear ftbw->off on reinits
      myisam/ft_static.c:
        get rid of default_charset_info in indexless fulltext searches
      myisam/ftdefs.h:
        get rid of default_charset_info in indexless fulltext searches
      sql/ha_myisam.h:
        get rid of default_charset_info in indexless fulltext searches
      sql/handler.h:
        get rid of default_charset_info in indexless fulltext searches
      sql/item_func.cc:
        get rid of default_charset_info in indexless fulltext searches
      8c750c46
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · f7d8d753
      unknown authored
      into mysql.com:/home/mysqldev/tulin/mysql-4.1
      
      
      f7d8d753
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 61232616
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      61232616
    • unknown's avatar
      added test to trigger drifferent fragmentations in ndb · 48e2d224
      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
      48e2d224
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1a3a4ee3
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
      
      
      1a3a4ee3
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · d716cb94
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
      
      
      d716cb94
    • unknown's avatar
      A fix: bug#6931: Date Type column problem when using UNION-Table · 66eb71f3
      unknown authored
             bug#7833:  Wrong datatype of aggregate column is returned
      
      
      mysql-test/r/func_group.result:
        Test case for bug 7833:  Wrong datatype of aggregate column is returned
      mysql-test/r/union.result:
        Test case for bug 6931: Date Type column problem when using UNION-Table.
      mysql-test/t/func_group.test:
        Test case for bug 7833:  Wrong datatype of aggregate column is returned
      mysql-test/t/union.test:
        Test case for bug 6931: Date Type column problem when using UNION-Table.
      66eb71f3
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d3694db6
      unknown authored
      into mysql.com:/usr/home/ram/work/4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      d3694db6
    • unknown's avatar
      type_float.result.es updated. · 4c695398
      unknown authored
      
      mysql-test/r/type_float.result.es:
        Updated.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      4c695398
    • unknown's avatar
      Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f2ebd8b1
      unknown authored
      into mysql.com:/home/timka/mysql/src/4.1-virgin
      
      
      f2ebd8b1
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/4.1-dbg · d5023070
      unknown authored
      into mysql.com:/home/timka/mysql/src/4.1-bug-8023
      
      
      d5023070
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 41780a75
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      
      41780a75
    • unknown's avatar
      Fix for BUG#7716: in in_string::set() take into account that the value returned · ebda548d
      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().
      ebda548d