1. 26 Nov, 2005 2 commits
  2. 25 Nov, 2005 12 commits
  3. 24 Nov, 2005 25 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1be7a7af
      unknown authored
      into moonbone.local:/work/13293-bug-5.0-mysql
      
      
      1be7a7af
    • unknown's avatar
      Remove t3 in join_nested.test · dc8a5d54
      unknown authored
      
      mysql-test/r/join_nested.result:
        Remove t3 too.
      mysql-test/t/join_nested.test:
        Remove t3 too.
      dc8a5d54
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · a5450538
      unknown authored
      into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
      
      
      a5450538
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · c91a2e9e
      unknown authored
      into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
      
      
      c91a2e9e
    • unknown's avatar
      Some post-merge cleaning, and made assert THD::store_globals() work at all times. · 0b262a62
      unknown authored
      
      mysql-test/t/sp.test:
        Tidying up after merge.
      sql/mysqld.cc:
        Make sure we have thd->thread_stack set before calling store_globals().
        (And fixed compiler warning.)
      sql/sql_class.cc:
        Init THD::tread_stack in constructor.
      0b262a62
    • unknown's avatar
      don't call handler::info() in SHOW CREATE TABLE · f8aae3e6
      unknown authored
      f8aae3e6
    • unknown's avatar
      Fix bug#13293 Wrongly used index results in endless loop. · 591fabb3
      unknown authored
      Loose index scan using only second part of multipart index was choosen, which
      results in creating wrong keys and endless loop.
      
      get_best_group_min_max() now allows loose index scan for distinct only if used
      keyparts forms a prefix of the index.
      
      
      mysql-test/t/group_min_max.test:
        Test case for bug #13293 Wrongly used index results in endless loop.
      mysql-test/r/group_min_max.result:
        Test case for bug #13293 Wrongly used index results in endless loop.
      sql/opt_range.cc:
        Fix bug #13293 Wrongly used index results in endless loop.
        get_best_group_min_max() now allows loose index scan for distinct only if used keyparts forms a prefix of the index.
      591fabb3
    • unknown's avatar
      Bug #15168 yassl failure on amd64 · a101950d
      unknown authored
       - Use libtool to build libraries
      
      
      config/ac-macros/yassl.m4:
        If necessary, disable inlining for all files in libtaocrypt not only integer.cpp
        Remove ver yassl_libs_with_path, not used anymore
      extra/yassl/src/Makefile.am:
        Let libtool build libraries
      extra/yassl/taocrypt/src/Makefile.am:
        Let libtool build libraries
        Only build one lib
      libmysqld/Makefile.am:
        Dont include yassl libs in libmysqld
      libmysqld/examples/Makefile.am:
        Add yassl includes and libs when linking examples with libmysqld
      a101950d
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 44662d2c
      unknown authored
      into moonbone.local:/work/14482-bug-4.1-mysql
      
      
      44662d2c
    • unknown's avatar
      Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused · 3190b21f
      unknown authored
      crash
      
      resolve_const_item() substitutes item which will evaluate to constant with
      equvalent constant item, basing on the item's result type. In this case
      subselect was resolved as constant, and resolve_const_item() was substituting
      it's result's Item_caches to Item_null. Later Item_cache's function was called
      for Item_null object, which caused server crash.
      
      resolve_const_item() now substitutes constants for items with 
      result_type == ROW_RESULT only for Item_rows.
      
      
      sql/item.cc:
        Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
        crash
        
        resolve_const_item() now applies optimization for items with
        result_type == ROW_RESULT only to Item_rows.
      mysql-test/t/select.test:
        Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
      mysql-test/r/select.result:
        Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
      3190b21f
    • unknown's avatar
      Make it buildable with -ansi flag on some platforms. · e6d90f51
      unknown authored
      
      extra/innochecksum.c:
        Define _XOPEN_SOURCE in order to include getopt.h when needed.
        
        The problem is that some platforms (for instance,
        SuSE 9.1/gcc-3.3.3) do not include getopt.h unless _XOPEN_SOURCE
        is defined, so optarg is undefined and the compiler complains.
      e6d90f51
    • unknown's avatar
      Polishing: get rid of C++-style comments. · 54f9b2cc
      unknown authored
      
      mysys/my_open.c:
        Get rid of C++-style comments.
      54f9b2cc
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · c3423d0d
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      c3423d0d
    • unknown's avatar
      Moved check of wrong schema version earlier · 102c0281
      unknown authored
      102c0281
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b323bb27
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b15047
      
      
      b323bb27
    • unknown's avatar
      table t7 was not dropped at the end · d2ac9b5b
      unknown authored
      
      mysql-test/r/join_nested.result:
        drop t7
      mysql-test/t/join_nested.test:
        drop t7
      d2ac9b5b
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 07198336
      unknown authored
      into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
      
      
      07198336
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · a2daaf87
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b15047
      
      
      a2daaf87
    • unknown's avatar
      small build fix for some compilers · 2665fb75
      unknown authored
      
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        build fix for some compilers
      2665fb75
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 40e8361c
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b15047
      
      
      40e8361c
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · ccb76736
      unknown authored
      into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Manual merge fix.
      mysql-test/t/sp.test:
        Manual merge fix.
      ccb76736
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 60f34874
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug15215
      
      
      60f34874
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 222871ca
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b15047
      
      
      sql/sql_class.h:
        Auto merged
      222871ca
    • unknown's avatar
      BUG#15215 mysqld fails at start-up because of illegal reply from mgmd · c2421d3f
      unknown authored
      In the rare circumstance where a mysqld connects to a mgm server, then the
      mgm server goes away before a node id can be allocated, it was possible to get
      an Error in mgm protocol parser error message.
      
      
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        When allocating node id, retry connecting to a management server if it goes away.
      ndb/src/mgmapi/mgmapi.cpp:
        Treat Eof and NoLine results from the parser as a sign that we should disconnect
        from this management server. It's up to the caller to work out if they want
        to try again.
      c2421d3f
    • unknown's avatar
      Don't use PATH_MAX for FN_REFLEN as this uses too much stack space · 97bfd41f
      unknown authored
      Larger stack size neaded for open table on x86 64 bit
      Fix failing test cases
      Deleted symlink from bk
      
      
      BitKeeper/etc/ignore:
        added libmysqld/ha_blackhole.cc
      BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
        Delete: libmysqld/ha_blackhole.cc
      include/my_global.h:
        Don't use PATH_MAX for FN_REFLEN as this uses too much stack space.
        (With a PATH_MAX of 4096, we use 80K for opening a table as there is several objects of size FN_REFLEN on stack)
      mysql-test/r/federated.result:
        Update results after error message changes
      mysql-test/r/grant.result:
        Update results after error message changes
      mysql-test/r/grant2.result:
        Update results after error message changes
      sql/ha_federated.cc:
        Fix error messages to be more consistent
      sql/mysql_priv.h:
        Stack size to have when opening a table
        (This was needed on x86 64 bit Linux)
      sql/share/errmsg.txt:
        Remove quotes around error string for federated as two quotes in the output looks strange
      sql/sql_base.cc:
        More correct stack size
      sql/sql_parse.cc:
        Set thread_stack before store_globals()
      sql/unireg.h:
        More correct MAX_DBKEY_LENGTH
      97bfd41f
  4. 23 Nov, 2005 1 commit