An error occurred fetching the project authors.
  1. 19 Jul, 2007 4 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.1 · e395b0ac
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/my_base.h:
        Auto merged
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      e395b0ac
    • unknown's avatar
      mysqldump.result: · 8e500b7b
      unknown authored
        Post-merge fix.
      
      
      mysql-test/r/mysqldump.result:
        Post-merge fix.
      8e500b7b
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 0a433b21
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/r/mysqldump.result:
        Merge with 5.0-opt.
      0a433b21
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28524 · 8b59beae
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      8b59beae
  2. 18 Jul, 2007 6 commits
    • unknown's avatar
      5.0-opt -> 5.1-opt merge · 155eb465
      unknown authored
      155eb465
    • unknown's avatar
      Fixed bug #28524. · 2bfe84d4
      unknown authored
      For each view the mysqldump utility creates a temporary table
      with the same name and the same columns as the view 
      in order to satisfy views that depend on this view.
      After the creation of all tables, mysqldump drops all
      temporary tables and creates actual views.
      However, --skip-add-drop-table and --compact flags disable
      DROP TABLE statements for those temporary tables. Thus, it was
      impossible to create the views because of existence of the
      temporary tables with the same names.
      
      
      client/mysqldump.c:
        Fixed bug #28524.
        The mysqldump utility has been modified to unconditionally drop
        temporary tables before the creation of views.
      mysql-test/t/mysqldump.test:
        Updated test case for bug #28524 and updated result of previous tests.
      mysql-test/r/mysqldump.result:
        Updated test case for bug #28524 and updated result of previous tests.
      2bfe84d4
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B29325-my_errno-5.0-opt · c9b88730
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
      
      
      mysys/my_symlink2.c:
        Auto merged
      c9b88730
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt · 4a07ed48
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
      
      
      mysql-test/r/type_time.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      BitKeeper/deleted/.del-index_merge.result:
        Auto merged
      mysql-test/include/index_merge1.inc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      storage/heap/ha_heap.h:
        Auto merged
      4a07ed48
    • unknown's avatar
      Bug #29325: create table overwrites .MYD file of other · a266c16d
      unknown authored
      table (datadir)
      Set errno when retunring an error in my_create_with_symlink.
      
      
      mysys/my_symlink2.c:
        Bug #29325: set errno when retunring 
        an error in my_create_with_symlink
      a266c16d
    • unknown's avatar
      Mark deadcode for gcov · 06b446da
      unknown authored
      06b446da
  3. 17 Jul, 2007 11 commits
  4. 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
  5. 15 Jul, 2007 2 commits
    • unknown's avatar
      item_cmpfunc.cc: · 56a65d7a
      unknown authored
        A typo fixed.
      
      
      sql/item_cmpfunc.cc:
        A typo fixed.
      56a65d7a
    • unknown's avatar
      item_cmpfunc.cc: · 3e925554
      unknown authored
        Fixed compiler warning.
      
      
      sql/item_cmpfunc.cc:
        Fixed compiler warning.
      3e925554