1. 25 Jul, 2007 1 commit
    • unknown's avatar
      Bug#28641 CREATE EVENT with '2038.01.18 03:00:00' let server crash. · cfdd2035
      unknown authored
      Creating an EVENT to be executed at a time close to the end of the allowed
      range (2038.01.19 03:14:07 UTC) would cause the server to crash. The
      expected behavior is to accept all calendar times within the interval and
      reject all other values without crashing.
      
      This patch replaces the function 'sec_to_epoch_TIME' with a Time_zone API call.
      This function was broken because it invoked the internal function 'sec_to_epoch'
      without respecting the restrictions on the function parameters (and this caused
      assertion failure). It also was used as a reverse function to
      Time_zone_utc::gmt_sec_to_TIME which it isn't.
      
      
      mysql-test/r/events_bugs.result:
        Added test case
      mysql-test/t/events_bugs.test:
        Added test case
      sql/event_data_objects.cc:
        Replaced function 'sec_since_epoch_TIME' since it was implemented as
        a wrapper around 'sec_since_epoch' without taking parameter restrictions
        into account. The function was used to load information about event
        execution time from mysql.events table. Further more, the function wasn't
        the inverse function of Time_zone_utc::gmt_sec_to_TIME() which was used
        by events code to store information about event execution time.
      sql/event_db_repository.cc:
        Replaced my_tz_UTC object with my_tz_OFFSET0 object because the first one
        doesn't supply us with a bijective MYSQL_TIME<->my_time_t translation. Instead
        the function sec_since_epoch_TIME was used as a reverse function to the method
        my_tz_UTC::gmt_sec_to_TIME.
      sql/event_queue.cc:
        Replaced my_tz_UTC object with my_tz_OFFSET0 object because the first one
        doesn't supply us with a bijective MYSQL_TIME<->my_time_t translation. Instead
        the function sec_since_epoch_TIME was used as a reverse function to the method
        my_tz_UTC::gmt_sec_to_TIME.
      sql/tztime.cc:
        * Remove function 'sec_since_epoch_TIME' since it was implemented as
        a wrapper around 'sec_since_epoch' without taking parameter restrictions
        into account. The function was used to load information about event
        execution time from mysql.events table. Further more, the function wasn't
        the inverse function of Time_zone_utc::gmt_sec_to_TIME() which was used
        by events code to store information about event execution time.
        
        * Added static Time_zone object for UTC+0 time zone.
      sql/tztime.h:
        Include extern pointer to static Time_zone object.
      cfdd2035
  2. 17 Jul, 2007 7 commits
  3. 16 Jul, 2007 17 commits
    • unknown's avatar
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · f614b4b0
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      f614b4b0
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.1-amain · 351f811f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      351f811f
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 0a5ece11
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/t/sp.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/include/mix1.inc:
        Manual merge.
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      0a5ece11
    • unknown's avatar
      Post-merge fixes (merge from the main). · bc642e11
      unknown authored
      
      mysql-test/r/innodb_mysql.result:
        Update test results (merge from the main tree).
      mysql-test/r/query_cache.result:
        Update test results (merge from the main tree).
      mysql-test/r/sp.result:
        Update test results (merge from the main tree).
      mysql-test/t/query_cache.test:
        Use --echo End of to simplify future merges.
      sql/handler.h:
        st_table_list -> TABLE_LIST
      sql/item_create.cc:
        A post-merge fix (this code is in sql_yacc.yy in 5.0)
      sql/rpl_utility.h:
        st_table_list -> TABLE_LIST
      sql/sp.cc:
        A post-merge fix.
      sql/sp_head.cc:
        In 5.1 memdup_root returns void*.
      sql/sql_show.cc:
        st_table_list -> TABLE_LIST
      sql/sql_show.h:
        st_table_list -> TABLE_LIST
      sql/sql_yacc.yy:
        A post-merge fix.
      sql/table.cc:
        st_table_list -> TABLE_LIST
      sql/table.h:
        st_table_list -> TABLE_LIST
      bc642e11
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b94fb828
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
      
      
      mysql-test/t/sp.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      mysql-test/t/innodb_mysql.test:
        Manual merge.
      b94fb828
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · d3c68163
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      sql/sql_parse.cc:
        Manual merge.
      d3c68163
    • unknown's avatar
      Bug#29050 Creation of a legal stored procedure fails if a database is not · de208926
      unknown authored
      selected prior: ensure the fix also works for information_schema
      tables.
      
      
      sql/sql_parse.cc:
        Ensure the fix for Bug#29050 works for information_schema tables.
      de208926
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 9562c54a
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_db.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_show.cc:
        Auto merged
      sql/sql_trigger.h:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/myisam/ha_myisam.h:
        Auto merged
      mysql-test/include/mix1.inc:
        Manual merge.
      mysql-test/r/information_schema.result:
        Manual merge.
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      mysql-test/r/query_cache.result:
        Manual merge.
      mysql-test/r/sp.result:
        Manual merge.
      mysql-test/t/information_schema.test:
        Manual merge.
      sql/handler.h:
        Manual merge.
      sql/sp.cc:
        Manual merge.
      sql/sp_head.cc:
        Manual merge.
      sql/sql_prepare.cc:
        Manual merge.
      sql/sql_trigger.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge.
      sql/table.h:
        Manual merge.
      storage/myisam/ha_myisam.cc:
        Manual merge.
      9562c54a
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-amain · 7dc85356
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      7dc85356
    • unknown's avatar
      Fix ndb_cache* test failures in the -runtime tree. · b6c0fb60
      unknown authored
      Do not try to acquire structure_guard_mutex for the second time
      when invalidating a table from send_result_to_client.
      
      
      sql/sql_cache.cc:
        Do not try to acquire mutex when invalidating a table
        from send_result_to_client().
        A follow up patch for the patch for Bug#21074.
        Reuse code by moving locking-independent invalidation functionality
        into invalidate_table_internal.
      sql/sql_cache.h:
        Add a new declaration.
      b6c0fb60
    • unknown's avatar
      Post-merge fix · f3c85706
      unknown authored
      Disabled a test that reports Slave SQL error in warnings file.
      
      
      f3c85706
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 146b0e14
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      mysql-test/r/events_bugs.result:
        Manual merge.
      146b0e14
    • unknown's avatar
      A follow up after the fix for Bug#21074 - fix NDB tests breaking on · 02a832df
      unknown authored
      asserts.
      The patch for Bug#21074 replaces acquisition of the global LOCK_open lock
      with exclusive locks on table names in such operations ad DROP TABLE
      and RENAME TABLE.
      Unfortunately, NDB internally assumes that LOCK_open is acquired and
      tries to release it.
      This dependency should be fixed by a separate (and significant in size)
      patch. For now we just satisfy it - after all, the original
      goal of the patch for Bug#21074 was to move query_cache_invalidate
      outside of the scope of LOCK_open, and we still can do that.
      
      This fixes some failing NDB tests in the runtime tree.
      
      
      sql/sql_rename.cc:
        Move release of LOCK_open after ha_ndbcluster::rename_tables to
        satisfy an assert in ndb_log_schema_op.
      02a832df
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 67e3dbc3
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
      
      
      67e3dbc3
    • unknown's avatar
      Raise version number after cloning 5.0.46 · 7d3cecca
      unknown authored
      7d3cecca
    • unknown's avatar
      BUG#29807 - innodb_mysql.test: Cannot find table test/t2 from the · a21ff660
      unknown authored
                  internal data dictionary
      - re-enabled innodb_mysql test;
      - added a rule to through away expected warning to mtr_report.pl;
      - fixed a test case to produce unique warning.
      
      
      mysql-test/include/mix1.inc:
        Modified a test case to through away expected warning.
      mysql-test/lib/mtr_report.pl:
        Through away a warning produced by BUG#29807 test.
      mysql-test/r/innodb_mysql.result:
        Modified a test case to through away expected warning.
      mysql-test/t/disabled.def:
        Re-enabled innodb_mysql.test.
      a21ff660
  4. 15 Jul, 2007 3 commits
    • unknown's avatar
      Post-merge fixes · 9828ab70
      unknown authored
      Disabled tests which break automatic merging due to
      non-empty warnings file.
      
      
      9828ab70
    • unknown's avatar
      Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in · 8023d919
      unknown authored
      Linux Debug build (possible deadlock)"
      
      The bug is not repeatable any more.
      
      
      mysql-test/r/innodb_mysql.result:
        Update test results (Bug#27296)
      mysql-test/t/innodb_mysql.test:
        Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in 
        Linux Debug build (possible deadlock)"
      8023d919
    • unknown's avatar
      A fix for Bug#27406 Events: failure only causes a warning. Update test · 7416224c
      unknown authored
      results.
      When executing a CREATE EVENT statement with ON COMPLETION NOT PRESERVE 
      clause (explicit or implicit) and completion date in the past, we do not 
      create the event. Or, put it differently, we create it and then drop 
      immediately.
      A warning is issued in this case, not an error -- we want to load 
      successfully old database dumps, and such dumps may contain events
      that are no longer valid.
      
      Update the warning text to not imply an erroneous condition. 
      
      
      mysql-test/r/events_bugs.result:
        Update the test results (Bug#27406)
      sql/share/errmsg.txt:
        Fix Bug#27406 "Events: failure only causes a warning" -- update the error
        message to not imply that there was a failure.
      7416224c
  5. 14 Jul, 2007 9 commits
  6. 13 Jul, 2007 2 commits
    • unknown's avatar
      A follow up after the patch for Bug#21074 - even though · 31ea7d04
      unknown authored
      we now have exclusive name lock on the table name in mysql_rm_table_part2,
      we still should keep LOCK_open - some storage engines are not
      ready for locking scope change and assume that LOCK_open is kept.
      Still, the binary logging and query cache invalidation calls
      moved out of LOCK_open scope.
      Fixes some of the broken 5.1-runtime tests (tests break on asserts).
      
      
      sql/ha_ndbcluster.cc:
        Do not lock LOCK_open for mysql_rm_table_part2 - it does that
        for us now.
      sql/mysql_priv.h:
        Remove an unused flag.
      sql/sql_class.h:
        Fix an unrelated compiler warning.
      sql/sql_db.cc:
        Adjust to the changed signature.
      sql/sql_table.cc:
        mysql_rm_table_part2: we need to keep LOCK_open while calling
        storage engine functions, even though now 
        we have an exclusive lock on the table name. Some of them assume that it's 
        kept and attempt to unlock it.
      31ea7d04
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.1-ateam · 08510d69
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug28810
      
      
      08510d69
  7. 12 Jul, 2007 1 commit
    • unknown's avatar
      BUG#29464 - load data infile into table with big5 chinese fulltext index · bae65627
      unknown authored
                  hangs 100% cpu
      
      Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
      character set.
      
      
      mysql-test/r/fulltext.result:
        Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
        character set.
      mysql-test/r/fulltext3.result:
        Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
        character set.
      mysql-test/t/fulltext.test:
        Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
        character set.
      mysql-test/t/fulltext3.test:
        Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
        character set.
      bae65627