1. 06 Feb, 2005 1 commit
  2. 05 Feb, 2005 12 commits
    • unknown's avatar
      result update after 4.1->5.0 merge · 976a77a6
      unknown authored
      
      mysql-test/r/drop_temp_table.result:
        result update
      976a77a6
    • unknown's avatar
      Merge · 8bd9d2db
      unknown authored
      
      BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
        Auto merged
      configure.in:
        Auto merged
      include/mysql.h:
        Auto merged
      scripts/Makefile.am:
        Auto merged
      mysql-test/r/drop_temp_table.result:
        SCCS merged
      sql/sql_base.cc:
        SCCS merged
      8bd9d2db
    • unknown's avatar
      Update test result · cff69743
      unknown authored
      
      mysql-test/r/type_date.result:
        Update results
      cff69743
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · fefcedba
      unknown authored
      into mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/item_func.cc:
        Auto merged
      fefcedba
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · cfe815f7
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-outer-joins-cleanup
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/table.h:
        Auto merged
      cfe815f7
    • unknown's avatar
      Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only... · e2c82051
      unknown authored
      Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments).
      
      
      sql/mysql_priv.h:
        Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only.
      sql/opt_range.cc:
        Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only.
      sql/sql_base.cc:
        Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only.
      sql/sql_select.cc:
        Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only.
      sql/table.h:
        Outer joins cleanup: 
         * Remove TABLE::outer_join and use TABLE::maybe_null only.
         * Added comments.
      e2c82051
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · d496d5c8
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      d496d5c8
    • unknown's avatar
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 270fc99c
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      270fc99c
    • 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
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0790c9fc
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      0790c9fc
  3. 04 Feb, 2005 27 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · b63fda51
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug7816
      
      b63fda51
    • 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
      A fix for Bug#6273 "building fails on link": we should not use · c03926d5
      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.
      c03926d5
    • unknown's avatar
      Backport of ChangeSet 1.1845 05/02/04 13:53:16 guilhem@mysql.com +1 -0 from 5.0. · 0c22eaa9
      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.
      0c22eaa9
    • unknown's avatar
      Fix for BUG#8055 "Trouble with replication from temporary tables and ignores": · 19add49c
      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).
      19add49c
    • unknown's avatar
      Update test results · 0caa2140
      unknown authored
      
      mysql-test/r/func_group.result:
        Update results
      0caa2140
    • unknown's avatar
      Merge · 197277bf
      unknown authored
      197277bf
    • unknown's avatar
      Merge changes · e50e2eaa
      unknown authored
      
      client/mysqlcheck.c:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/ft_static.c:
        Auto merged
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/func_group.test:
        Auto merged
      mysql-test/t/multi_update.test:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/ha_myisam.h:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/field.cc:
        Clean up merge
      e50e2eaa
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-8029 · 32468d3a
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      32468d3a
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-6067 · a2f1d7d5
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/field.cc:
        Auto merged
      a2f1d7d5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 7794fe74
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      7794fe74
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 4d9faee1
      unknown authored
      into mysql.com:/home/mysqldev/tulin/mysql-4.1
      
      4d9faee1
    • unknown's avatar
      Merge Bug#7310 from 4.0 · 81200b5b
      unknown authored
      81200b5b
    • 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 serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 42d48eba
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      42d48eba
    • unknown's avatar
      Embedded version of test fixed · f464084d
      unknown authored
      
      mysql-test/r/insert_select.result.es:
        Test.es fixed
      f464084d
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · e2950ae3
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/item_func.cc:
        Auto merged
      e2950ae3
    • unknown's avatar
      indexless boolean fulltext search was depending on default_charset_info - Bug#8159 · 1d866688
      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
      1d866688
    • 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-4.1 · ae5b259c
      unknown authored
      into mysql.com:/home/mysqldev/tulin/mysql-4.1
      
      ae5b259c
    • 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