An error occurred fetching the project authors.
  1. 03 Nov, 2006 3 commits
  2. 02 Nov, 2006 5 commits
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 2dac6ffd
      unknown authored
      into  example.com:/work/mysql-5.1-runtime-bug22830-new
      
      
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      2dac6ffd
    • unknown's avatar
      Better fix for bug#22830 · 63030d76
      unknown authored
      Events: crash with procedure which alters events with function
      
      Post-review CS
      
      This fix also changes the handling of KILL command combined with
      subquery. It changes the error message given back to "not supported",
      from parse error. The error for CREATE|ALTER EVENT has also been changed
      to generate "not supported yet" instead of parse error.
      In case of a SP call, the error is "not supported yet". This change
      cleans the parser from code which should not belong to there. Still
      LEX::expr_allows_subselect is existant because it simplifies the handling
       of SQLCOM_HA_READ which forbids subselects.
      
      
      mysql-test/r/events_bugs.result:
        update resut
      mysql-test/r/events_grant.result:
        update result
      mysql-test/r/kill.result:
        the error message has been changed for KILL
      mysql-test/t/events_bugs.test:
        Update old tests with the new emitted error
        
        Add a test case for
        BUG#22830 Events: crash with procedure which alters events with function
      mysql-test/t/events_grant.test:
        add ORDER BY clause to keep the result deterministic.
      mysql-test/t/kill.test:
        use name of the error, and change the error
        from parse error, to not supported
      sql/sql_lex.cc:
        Add an auxiliary function that checks whether SP and/or
        tables are used in the statement. This function is helpful for
        statements that cannot handle subqueries ans SP calls. Adding out
        of the parser cleans the latter of handling of special cases and
        letting it do its job of parsing.
      sql/sql_lex.h:
        helper function to check whether a table or SP was used
      sql/sql_parse.cc:
        Use LEX::table_or_sp_used() for SQLCOM_CREATE_EVENT, SQLCOM_ALTER_EVENT
        and SQLCOM_KILL. SQLCOM_DROP event does not use `expr` rule and thus a check is
        not needed.
      sql/sql_yacc.yy:
        Remove usage of LEX::expr_allows_subselect for CREATE|ALTER EVENT
        and KILL. There is only one left occurence - SQLCOM_HAREAD, but it 
        adds one table to the list of tables
      63030d76
    • unknown's avatar
      A post-merge fix. · 74a15e2f
      unknown authored
      74a15e2f
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 3c52ab72
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      include/mysql.h:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      BitKeeper/deleted/.del-make_win_bin_dist:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/ndb_update.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/ps.test:
        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_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      storage/ndb/src/common/util/SimpleProperties.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      storage/ndb/tools/ndb_size.pl:
        Auto merged
      storage/ndb/tools/ndb_size.tmpl:
        Auto merged
      sql/sql_table.cc:
        SCCS merged
      3c52ab72
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 31a87fde
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.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/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
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      mysql-test/r/ps.result:
        SCCS merged
      31a87fde
  3. 01 Nov, 2006 8 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
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2 · 8c6382f5
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
      
      
      sql/sp.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      8c6382f5
    • 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
    • unknown's avatar
      Merge trift2.:/MySQL/M51/clone-5.1 · a1db0e72
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      a1db0e72
  4. 31 Oct, 2006 3 commits
  5. 30 Oct, 2006 8 commits
  6. 27 Oct, 2006 13 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 · ab40b627
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/mysql_priv.h:
        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
      ab40b627
    • 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 joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · d7dc169e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      d7dc169e
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · bd6203d5
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      bd6203d5
    • 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
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584 · 3ce0cadd
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug22584
      
      
      mysql-test/r/view.result:
        Manual merge.
      mysql-test/t/view.test:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      3ce0cadd
    • 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