An error occurred fetching the project authors.
  1. 17 Sep, 2004 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · dbee90a7
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-amf
      
      
      dbee90a7
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 5c422671
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      sql/item.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      5c422671
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 210829a1
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-amf
      
      
      210829a1
    • unknown's avatar
      Fixed BUG#3583: query cache doesn't work for stored procedures. · e2c4279c
      unknown authored
      mysql-test/r/sp.result:
        New test case for BUG#3583.
        (And current query is now set correctly.)
      mysql-test/t/sp.test:
        New test case for BUG#3583.
      sql/sp_head.cc:
        Set the thd->query and try to use cached query, if any, when executing a statement.
      sql/sp_head.h:
        Extract the sub-query and store in sp_instr_stmt.
      sql/sql_cache.cc:
        Keep the net->pkt_nr up-to-date when using query cache.
        This makes it work with stored procedures too.
      sql/sql_cache.h:
        Keep the net->pkt_nr up-to-date when using query cache.
        This makes it work with stored procedures too.
      sql/sql_yacc.yy:
        Extract the sub-query and store in sp_instr_stmt.
        (And it's never safe to cache references to local variables.)
      e2c4279c
    • unknown's avatar
      Fixed memory leak that occured after merge with 4.1 · 944f84eb
      unknown authored
      We should not replace Item_arena in Item_bool_func2::fix_length_and_dec() if this is
      conventional statement, since in this case THD::current_arena is the same as active arena
      and we will overwrite arena with its older version during restore_backup_item_arena()
      call.
      
      
      944f84eb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 32fed579
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-tzfix
      
      
      32fed579
    • unknown's avatar
      Small after merge cleanup of time zone initialization code. · 436b8045
      unknown authored
      sql/tztime.cc:
        After merge cleanup.
        Updated comments for tz_init_table_list() and my_tz_get_table_list().
        my_tz_init(): Simplified table list creation.
      436b8045
    • unknown's avatar
      Removed wrong warnings in test suite (This was because select_insert /... · e74b00bb
      unknown authored
      Removed wrong warnings in test suite (This was because select_insert / select_create results was not freed.
      Added thd to openfrm() for initialization of TABLE->in_use. This fixed a bug in BDB handling where table->in_use was used early
      
      
      mysql-test/r/key.result:
        Added new tests that shows a bug in warnings hat
      mysql-test/t/key.test:
        Added new tests that shows a bug in warnings hat
      sql/handler.cc:
        Added thd to openfrm() for initialization of TABLE->in_use
      sql/item.cc:
        New function to avoid warnings when giving field a value
      sql/item.h:
        New function to avoid warnings when giving field a value
      sql/mysql_priv.h:
        Added thd to openfrm() for initialization of TABLE->in_use
      sql/opt_range.cc:
        Don't give warnings in optimizer when internally storing a field value in a field. (Should be ok as we ar checking the feild in the WHERE clause later)
      sql/sql_base.cc:
        Give memroot explicitely to open_unireg_entry() and open_table() (Makes code simpler)
        Ensure that table->in_use is set early
        New arguments for openfrm()
      sql/sql_insert.cc:
        More debugging & comments
      sql/sql_parse.cc:
        Delete results for select_insert and select_create. This fixed a bug that generated warnings in test suite
      sql/sql_select.h:
        Don't give warnings in optimizer when internally storing a field value in a field. (Should be ok as we ar checking the feild in the WHERE clause later)
      sql/sql_table.cc:
        New arguments to open_table() and openfrm()
      sql/table.cc:
        Added thd to openfrm() for initialization of TABLE->in_use
        This fixes some bugs in BDB where table->in_use was used
      e74b00bb
  2. 16 Sep, 2004 2 commits
    • unknown's avatar
      now we allow to careate VIEW without any privileges on view columns (except... · f284ce04
      unknown authored
      now we allow to careate VIEW without any privileges on view columns (except create view privilege) (BUG#5152)
      
      
      mysql-test/r/view.result:
        now we allow to careate VIEW without any privileges on view columns (except create view privilege)
        test of blocking try of getting more privileges on colemn with vierw using
      mysql-test/t/view.test:
        now we allow to careate VIEW without any privileges on view columns (except create view privilege)
        test of blocking try of getting more privileges on colemn with vierw using
      sql/sql_view.cc:
        now we allow to careate VIEW without any privileges on view columns (except create view privilege)
      f284ce04
    • unknown's avatar
      updateability of field with collation support (BUG#5506) · 29ec367e
      unknown authored
      mysql-test/r/view.result:
         Collation with view update
      mysql-test/t/view.test:
         Collation with view update
      sql/item.h:
        updateability of field with collation support
      sql/item_strfunc.h:
        updateability of field with collation support
      sql/sql_insert.cc:
        updateability of field with collation support
      sql/sql_update.cc:
        updateability of field with collation support
      sql/sql_view.cc:
        updateability of field with collation support
      29ec367e
  3. 15 Sep, 2004 3 commits
    • unknown's avatar
      Merge · 6c3e6651
      unknown authored
      BitKeeper/etc/logging_ok:
        auto-union
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_help.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_class.h:
        SCCS merged
      sql/sql_parse.cc:
        SCCS merged
      6c3e6651
    • unknown's avatar
      Added some missing per status variables. · 4ef01ca2
      unknown authored
      sql/ha_isam.cc:
        Added per status variables.
      sql/ha_isammrg.cc:
        Added per status variables.
      4ef01ca2
    • unknown's avatar
      Added options --auto-increment-increment and --auto-increment-offset. · ffc0d185
      unknown authored
      This allows one to setup a master <-> master replication with non conflicting auto-increment series.
      Cleaned up binary log code to make it easyer to add new state variables.
      Added simpler 'upper level' logic for artificial events (events that should not cause cleanups on slave).
      Simplified binary log handling.
      Changed how auto_increment works together with to SET INSERT_ID=# to make it more predictable: Now the inserted rows in a multi-row statement are set independent of the existing rows in the table. (Before only InnoDB did this correctly)
      
      
      
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Disable End_log_pos column from 'show binlog events' as this is now different from before
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Disable End_log_pos column from 'show binlog events' as this is now different from before
      sql/ha_berkeley.cc:
        Changed prototype for get_auto_increment()
      sql/ha_berkeley.h:
        Changed prototype for get_auto_increment()
      sql/ha_heap.cc:
        Changed prototype for get_auto_increment()
      sql/ha_heap.h:
        Changed prototype for get_auto_increment()
      sql/ha_innodb.cc:
        Change how auto-increment is calculated.
        Now the auto-increment logic is done in 'update_auto_increment()' to ensure that all handlers has the same auto-increment usage
      sql/ha_innodb.h:
        Changed prototype for get_auto_increment()
      sql/ha_myisam.cc:
        Changed prototype for get_auto_increment()
      sql/ha_myisam.h:
        Changed prototype for get_auto_increment()
      sql/ha_ndbcluster.cc:
        Changed prototype for get_auto_increment()
      sql/ha_ndbcluster.h:
        Changed prototype for get_auto_increment()
      sql/handler.cc:
        Remove some usage of current_thd
        Changed how auto_increment works with SET INSERT_ID to make it more predictable
        (Now we should generate same auto-increment serie on a slave, even if the table has rows that was not on the master.
        Use auto_increment_increment and auto_increment_offset
      sql/handler.h:
        Changed prototype for get_auto_increment()
      sql/log.cc:
        Remove usage of 'set_log_pos()' to make code simpler. (Now log_pos is set in write_header())
        Use 'data_written' instead of 'get_event_len()' to calculate how much data was written in the log
      sql/log_event.cc:
        Simple optimizations.
        Remove cached_event_len (not used variable)
        Made comments fit into 79 chars
        Removed Log_event::set_log_pos(). Now we calculate log_pos in write_header().
        Renamed write_data() to write() as the original write() function was not needed anymore.
        Call writing of event header from event::write() functions. This made it easier to calculate the length of an event.
        Simplified 'write_header' and remove 'switches' from it.
        Changed all write() functions to return 'bool'. (The previous return values where not consistent)
        Store auto_increment_increment and auto_increment_offset in binary log
        Simplified how Query_log_event's where written and read. Now it's much easier to add now status variables for a query event to the binary log.
        Removed some old MySQL 4.x code to make it easier to grep for functions used in 5.0
      sql/log_event.h:
        Changed return type of write() functions to bool. (Before we returned -1 or 1 for errors)
        write_data() -> write()
        Added 'data_written' member to make it easier to get length of written event.
        Removed 'cached_event_len' and 'get_event_len()'
        Added usage of auto_increment_increment and auto_increment_offset
        Added 'artifical_event' to Start_log_event_v3, to hide logic that we in the binary log use log_pos=0 as a flag for an artifical event.
      sql/mysqld.cc:
        Added options --auto-increment-increment and --auto-increment-offset
      sql/set_var.cc:
        Added variables auto_increment_increment and auto_increment_offset
      sql/slave.cc:
        Changed errors -> warnings & information (in error log)
      sql/sql_class.cc:
        Added THD::cleanup_after_query(). This makes some code simpler and allows us to clean up 'next_insert_id' after query
      sql/sql_class.h:
        Added new auto_increment_xxx variables
        Moved some functions/variables in THD class
      sql/sql_help.cc:
        Removed compiler warning
      sql/sql_insert.cc:
        Call 'restore_auto_increment()' if row was not inserted.
        This makes it easier for handler to reuse the last generated auto-incrment value that was not used (for example in case of duplicate key)
      sql/sql_parse.cc:
        Use cleanup_after_query()
      sql/sql_prepare.cc:
        Use cleanup_after_query()
      sql/sql_table.cc:
        R
      ffc0d185
  4. 14 Sep, 2004 1 commit
    • unknown's avatar
      Fixed a couple of bugs. · e32059a9
      unknown authored
      sql/ha_ndbcluster.cc:
        Changed some old global variables to per thread specific in ha_ndbcluster.cc
      sql/sql_help.cc:
        Added parenthesis.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      e32059a9
  5. 13 Sep, 2004 3 commits
    • unknown's avatar
      Two small fixes to make -debug version usable again. · 66434a6c
      unknown authored
      include/my_sys.h:
        Temporaly reverting Monty's optimization of clear_alloc_root() since it makes -debug server
        unusable.
      sql/sql_select.cc:
        After merge fix. Now deletion is done outside of handle_select().
        (We fixed the same issue with deletion of LEX::result in 4.1 for prepared statements
         but in more general way).
      66434a6c
    • unknown's avatar
      Merge. · edb9559f
      unknown authored
      include/my_sys.h:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/sql_class.h:
        Merge
      edb9559f
    • unknown's avatar
      93527151
  6. 11 Sep, 2004 4 commits
  7. 10 Sep, 2004 13 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f4c303b8
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im/default_patch/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      f4c303b8
    • unknown's avatar
      Fixed a problem causing load_defaults not to accept some command-line · 15526e4e
      unknown authored
      options.
      
      
      mysys/default.c:
        Fixed search_files function to return the number of used arguments
        properly.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      15526e4e
    • unknown's avatar
      Fix bad output in SHOW CREATE VIEW, update affected · 952a778d
      unknown authored
      test result.
      
      
      mysql-test/r/view.result:
        Update test result to match sql_show.cc change.
      sql/sql_show.cc:
        Fix bad output in SHOW CREATE VIEW.
      952a778d
    • unknown's avatar
      view with WHERE in nested join (BUG#5511) · 8b2ffdbf
      unknown authored
      mysql-test/r/view.result:
        view with WHERE in nested join
      mysql-test/t/view.test:
        view with WHERE in nested join
      sql/table.cc:
        fixed merging of VIEW
      8b2ffdbf
    • unknown's avatar
      sql_yacc.yy: · 9af3278f
      unknown authored
        Make "FRAC_SECOND"/"SQL_TSI_FRAC_SECOND" non-reserved words,
        must like "SECOND"/"SQL_TSI_SECOND", "MINUTE"/"SQL_TSI_MINUTE",
        etc.
        Will wait for okay to push. (It doesn't break any tests.)
      
      
      sql/sql_yacc.yy:
        Make "FRAC_SECOND"/"SQL_TSI_FRAC_SECOND" non-reserved words,
        must like "SECOND"/"SQL_TSI_SECOND", "MINUTE"/"SQL_TSI_MINUTE",
        etc.
      9af3278f
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · d6f66318
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0-merge
      
      
      d6f66318
    • unknown's avatar
      Fixed BUG#4941: Stored procedure crash fetching null value into variable. · 749c0384
      unknown authored
      mysql-test/r/sp.result:
        New test case for BUG#4941.
      mysql-test/t/sp.test:
        New test case for BUG#4941.
      sql/protocol_cursor.cc:
        Handle null values.
      sql/sp_rcontext.cc:
        Handle null values.
      749c0384
    • unknown's avatar
      post merge fix · b5983daa
      unknown authored
      b5983daa
    • unknown's avatar
      Merge · 0650a284
      unknown authored
      sql/sql_handler.cc:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      0650a284
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · fc8da24a
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      fc8da24a
    • unknown's avatar
      thd pointer fixed · 76001900
      unknown authored
      BitKeeper/etc/ignore:
        Added libmysqld/sql_trigger.cc to the ignore list
      mysql-test/r/merge.result:
        fix of test
      76001900
    • unknown's avatar
      Fixed BUG#3294: Stored procedure crash if table dropped before use. · 1912148c
      unknown authored
        Dropping the table was not the real problem, the problem was with errors
        occuring within error handlers.
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#3294.
      mysql-test/t/sp-error.test:
        New test case for BUG#3294.
      sql/sp_head.cc:
        Use hreturn instruction both for continue and exit handlers (a special case
        of a jump).
      sql/sp_head.h:
        Use hreturn instruction both for continue and exit handlers (a special case
        of a jump).
      sql/sp_rcontext.cc:
        Keep track on if we're in a handler already, for error handling.
      sql/sp_rcontext.h:
        Keep track on if we're in a handler already, for error handling.
      sql/sql_yacc.yy:
        Use hreturn instruction both for continue and exit handlers (a special case
        of a jump).
      1912148c
    • unknown's avatar
      Fixed --with-embedded builds. · 862e7856
      unknown authored
      Added previously missing sql_trigger.cc file to embedded library.
      
      
      BitKeeper/etc/ignore:
        Added libmysqld/sql_trigger.cc to the ignore list
      libmysqld/Makefile.am:
        Added previously sql_trigger.cc file to embedded library.
      862e7856
  8. 09 Sep, 2004 6 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · f3d4db99
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.h:
        Auto merged
      f3d4db99
    • unknown's avatar
      post merge fixes · b386f888
      unknown authored
      mysql-test/t/merge.test:
        additional test
      sql/item.h:
        parameter to detect need of saving view field names
      sql/item_subselect.cc:
        arena fix
        used nearest thd pointer
      sql/item_sum.cc:
        after merge fix
      sql/mysql_priv.h:
        after merge fix
      sql/sql_base.cc:
        fixed unique test
        fixed postmerge arena mamgement
      sql/sql_class.h:
        mey method to detect conventional execution
      sql/sql_handler.cc:
        new parameter
      sql/sql_lex.cc:
        fixed postmerge arena mamgement
      sql/sql_parse.cc:
        fixed unique test
      sql/sql_select.cc:
        fixed postmerge arena mamgement
      sql/sql_union.cc:
        fixed postmerge arena mamgement
      sql/sql_view.cc:
        fixed postmerge arena mamgement
      sql/table.cc:
        fixed postmerge arena mamgement
      b386f888
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b0afd74e
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-1218-a
      
      
      sql/item_func.h:
        Auto merged
      b0afd74e
    • unknown's avatar
      After merge fixes for WL#1218 "Triggers" · 97cbcbb0
      unknown authored
      mysql-test/t/trigger.test:
        After merge fix, error codes corrected.
      sql/sp_head.cc:
        After mrege fix. Fixed typo.
      sql/sql_trigger.cc:
        After merge fix. wait_if_gloabl_read_lock has one more argument now.
      97cbcbb0
    • unknown's avatar
      Fixed BUG#4487: Stored procedure connection aborted if uninitialized char. · 0994dc39
      unknown authored
      mysql-test/r/sp.result:
        New test case for BUG#4487.
      mysql-test/t/sp.test:
        New test case for BUG#4487.
      sql/item_func.h:
        Propagate null_value properly in sp functions.
      0994dc39
    • unknown's avatar
      Yet another manual merge with main tree for patch for WL#1218 "Triggers" · eb75a9fd
      unknown authored
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/german/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/serbian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      include/mysqld_error.h:
        Manual merge.
      sql/Makefile.am:
        Manual merge.
      sql/mysql_priv.h:
        Manual merge.
      sql/sp_head.cc:
        Manual merge.
      sql/sql_lex.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge.
      eb75a9fd