1. 16 Nov, 2006 2 commits
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug17047 · ec845335
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17047
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/func_in.result:
        Manual merge.  Add "End of 5.0 tests".
      mysql-test/t/func_in.test:
        Manual merge.  Add "End of 5.0 tests".
      ec845335
    • unknown's avatar
      BUG#17047: CHAR() and IN() can return NULL without signaling NULL result · e40e8052
      unknown authored
      The problem was that some functions (namely IN() starting with 4.1, and
      CHAR() starting with 5.0) were returning NULL in certain conditions,
      while they didn't set their maybe_null flag.  Because of that there could
      be some problems with 'IS NULL' check, and statements that depend on the
      function value domain, like CREATE TABLE t1 SELECT 1 IN (2, NULL);.
      
      The fix is to set maybe_null correctly.
      
      
      mysql-test/r/func_in.result:
        Add result for bug#17047: CHAR() and IN() can return NULL without
        signaling NULL result.
      mysql-test/t/func_in.test:
        Add test case for bug#17047: CHAR() and IN() can return NULL without
        signaling NULL result.
      sql/item_cmpfunc.cc:
        Remove assignment to maybe_null, as it was already set in fix_fields()
        based on all arguments, not only on the first.
      e40e8052
  2. 01 Nov, 2006 6 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 413d2e28
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
      
      
      mysql-test/r/ndb_update.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/log_event.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
      sql/sql_delete.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      413d2e28
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5d1f0164
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      5d1f0164
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2886e07d
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/log_event.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
      sql/sql_delete.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      2886e07d
    • unknown's avatar
      ndb - revert bug to wait for "proper" bug fix · 0c9fc6ba
      unknown authored
        bug#21052
      
      
      ndb/src/mgmsrv/Services.cpp:
        revert bug to wait for "proper" bug fix
      0c9fc6ba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · b7a4d782
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
      
      
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      b7a4d782
    • unknown's avatar
      Small cleanup in code handling stored routines/table prelocking. · 57c2f22a
      unknown authored
      Use lazy initialization for Query_tables_list::sroutines hash.
      This step should significantly decrease amount of memory consumed
      by stored routines as we no longer will allocate chunk of memory
      required for this HASH for each statement in routine.
      
      
      include/hash.h:
        Introduced auxillary hash_init_opt() macro which simplifies
        lazy initialization of HASH objects.
      sql/sp.cc:
        Use lazy initialization for Query_tables_list::sroutines hash.
        This step should significantly decrease amount of memory consumed
        by stored routines as we no longer will allocate chunk of memory
        required for this HASH for each statement in routine.
      sql/sql_lex.cc:
        Use lazy initialization for Query_tables_list::sroutines hash.
        This step should significantly decrease amount of memory consumed
        by stored routines as we no longer will allocate chunk of memory
        required for this HASH for each statement in routine.
      sql/sql_lex.h:
        Updated comment describing Query_tables_list::sroutines to
        reflect that now we are use lazy initialization for this hash.
        Added constant for initial size of this hash.
      57c2f22a
  3. 31 Oct, 2006 2 commits
  4. 30 Oct, 2006 7 commits
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · 6a503b67
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
      
      
      sql/mysql_priv.h:
        Auto merged
      6a503b67
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime · 49c9509a
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
      
      
      49c9509a
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915 · b372ebc5
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
      
      
      sql/mysql_priv.h:
        SCCS merged
      sql/mysqld.cc:
        SCCS merged
      b372ebc5
    • unknown's avatar
      BUG#21915: Changing limits of table_cache when setting max_connections · 885dc1cb
      unknown authored
      If the user has specified --max-connections=N or --table-open-cache=M
      options to the server, a warning could be given that some values were
      recalculated, and table-open-cache could be assigned greater value.
      
      Note that both warning and increase of table-open-cache were totally
      harmless.
      
      This patch fixes recalculation code to ensure that table-open-cache will
      be never increased automatically and that a warning will be given only if
      some values had to be decreased due to operating system limits.
      
      No test case is provided because we neither can't predict nor control
      operating system limits for maximal number of open files.
      
      
      sql/mysql_priv.h:
        Add constants for table_cache minimum and default values.
      sql/mysqld.cc:
        Fix max_connections and table_cache_size re-computation.
      885dc1cb
    • unknown's avatar
      A cleanup. · 26770e3a
      unknown authored
      
      sql/sql_parse.cc:
        ALTER TABLE should not be affected by DONT_ALLOW_SHOW_COMMANDS
        (a bug that's there since version 1.1)
      26770e3a
    • unknown's avatar
      Cleanup. · f6e92be9
      unknown authored
      
      sql/sql_table.cc:
        Remove unused code (it's also made obsolete by work in 5.1)
      f6e92be9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d17fd8c9
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      d17fd8c9
  5. 27 Oct, 2006 9 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 5d10a445
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      5d10a445
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 142a4485
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      sql/sql_select.cc:
        Auto merged
      142a4485
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 3e2dacae
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      3e2dacae
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 75776305
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      75776305
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 16d6c0b2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      16d6c0b2
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · ba583978
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      ba583978
    • unknown's avatar
      ndb - valgrind · 11ac4907
      unknown authored
        Still leakage, make sure all unlinked operations are put back so they will be release
        (on failing blob operations, when AO_IgnoreError)
      
      
      ndb/src/ndbapi/NdbConnection.cpp:
        Still leakage, make sure all unlinked operations are put back so they will be release
      11ac4907
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · aa137976
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584
      
      
      mysql-test/r/view.result:
        Manual merge.
      mysql-test/t/view.test:
        Manual merge.
      aa137976
    • unknown's avatar
      BUG#22584: last_insert_id not updated after inserting a record through · 532735e6
      unknown authored
      a updatable view.
      
      When there's a VIEW on a base table that have AUTO_INCREMENT column, and
      this VIEW doesn't provide an access such column, after INSERT to such
      VIEW LAST_INSERT_ID() did not return the value just generated.
      
      This behaviour is intended and correct, because if the VIEW doesn't list
      some columns then these columns are effectively hidden from the user,
      and so any side effects of inserting default values to them.
      
      However, there was a bug that such statement inserting into a view would
      reset LAST_INSERT_ID() instead of leaving it unchanged.
      
      This patch restores the original value of LAST_INSERT_ID() instead of
      resetting it to zero.
      
      
      mysql-test/r/view.result:
        Add result for bug#22584: last_insert_id not updated after inserting
        a record through a updatable view.
      mysql-test/t/view.test:
        Add test case for bug#22584: last_insert_id not updated after inserting
        a record through a updatable view.
      sql/sql_parse.cc:
        When we have inserted into a view, and AUTO_INCREMENT column is not
        accessed from this view, instead of setting LAST_INSERT_ID to zero set
        it to the value it had before this statement was executed.
      532735e6
  6. 25 Oct, 2006 14 commits