1. 28 Sep, 2004 1 commit
  2. 26 Sep, 2004 2 commits
  3. 24 Sep, 2004 4 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com://home/bk/mysql-5.0 · fb8c82a9
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0
      
      fb8c82a9
    • unknown's avatar
      In binary log events, flags are 2 bytes, not 4. Using 4 resulted in buffer... · c2bc847c
      unknown authored
      In binary log events, flags are 2 bytes, not 4. Using 4 resulted in buffer overflow (and on a certain build it resulted in overwriting another part of the event without crashing :( ).
      
      
      sql/log_event.cc:
        flags are 2 bytes, not 4. Using 4 resulted in buffer overflow (and on a certain build it resulted in overwriting another part of the event without crashing :( ).
      c2bc847c
    • unknown's avatar
      For now we will require super privilege for creating/dropping trigger because proper · ea82ef87
      unknown authored
      privilege checking is not in place yet.
      
      ea82ef87
    • unknown's avatar
      new show create view output · 49a282af
      unknown authored
      mysqldump view support (BUG#4972)
      workaround to allow view work after LOCK TABLES
      
      
      client/mysqldump.c:
        view support
      mysql-test/r/lowercase_view.result:
        new show create view output
      mysql-test/r/view.result:
        new show create view output
        test of locked views
      mysql-test/t/view.test:
        new show create view output
        test of locked views
      sql/sql_base.cc:
        workaround to allow view work after LOCK TABLES
      sql/sql_show.cc:
        new show create view output (to help mysql dump detect views)
      49a282af
  4. 18 Sep, 2004 1 commit
  5. 17 Sep, 2004 9 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b8624674
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-amf
      
      b8624674
    • unknown's avatar
      SHOW CREATE VIEW (TABLE) privilege now reqiere show create privilege · bae5ff38
      unknown authored
      (BUG#4777)
      
      
      mysql-test/r/view.result:
        fixed SHOW CREATE VIEW privileges requrements
      mysql-test/t/view.test:
        fixed SHOW CREATE VIEW privileges requrements
      sql/sql_acl.cc:
        fixed command name
      bae5ff38
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · e95a75e5
      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
      e95a75e5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cee3d5c4
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-amf
      
      cee3d5c4
    • unknown's avatar
      Fixed BUG#3583: query cache doesn't work for stored procedures. · 7aaa1865
      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.)
      7aaa1865
    • unknown's avatar
      Fixed memory leak that occured after merge with 4.1 · 4151c404
      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.
      
      4151c404
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a59095a7
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-tzfix
      
      a59095a7
    • unknown's avatar
      Small after merge cleanup of time zone initialization code. · 96d5444c
      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.
      96d5444c
    • unknown's avatar
      Removed wrong warnings in test suite (This was because select_insert /... · d209efc0
      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
      d209efc0
  6. 16 Sep, 2004 2 commits
    • unknown's avatar
      now we allow to careate VIEW without any privileges on view columns (except... · c9017eaf
      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)
      c9017eaf
    • unknown's avatar
      updateability of field with collation support (BUG#5506) · 35840efc
      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
      35840efc
  7. 15 Sep, 2004 3 commits
    • unknown's avatar
      Merge · 4ff57e80
      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
      4ff57e80
    • unknown's avatar
      Added some missing per status variables. · 50226162
      unknown authored
      
      sql/ha_isam.cc:
        Added per status variables.
      sql/ha_isammrg.cc:
        Added per status variables.
      50226162
    • unknown's avatar
      Added options --auto-increment-increment and --auto-increment-offset. · 8267fd7a
      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
      8267fd7a
  8. 14 Sep, 2004 1 commit
    • unknown's avatar
      Fixed a couple of bugs. · 48b4ba62
      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
      48b4ba62
  9. 13 Sep, 2004 3 commits
    • unknown's avatar
      Two small fixes to make -debug version usable again. · 21eb87c5
      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).
      21eb87c5
    • unknown's avatar
      Merge. · 2bbed0d2
      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
      2bbed0d2
    • unknown's avatar
      9c00cf35
  10. 11 Sep, 2004 4 commits
  11. 10 Sep, 2004 10 commits