List:Commits« Previous MessageNext Message »
From:Marc Alff Date:December 2 2010 3:07pm
Subject:bzr push into mysql-trunk-bugfixing branch (marc.alff:3408 to 3409) WL#4816
View as plain text  
 3409 Marc Alff	2010-12-02 [merge]
      Merge mysql-trunk (WL#4816) --> mysql-trunk-bugfixing

    removed:
      Doxyfile-wl4895
      mysql-test/suite/perfschema/r/schema.result
    added:
      Doxyfile-perfschema
      mysql-test/suite/perfschema/r/ddl_os_global_by_type.result
      mysql-test/suite/perfschema/r/ddl_setup_objects.result
      mysql-test/suite/perfschema/r/dml_os_global_by_type.result
      mysql-test/suite/perfschema/r/dml_setup_objects.result
      mysql-test/suite/perfschema/r/setup_objects.result
      mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
      mysql-test/suite/perfschema/t/ddl_os_global_by_type.test
      mysql-test/suite/perfschema/t/ddl_setup_objects.test
      mysql-test/suite/perfschema/t/dml_os_global_by_type.test
      mysql-test/suite/perfschema/t/dml_setup_objects.test
      mysql-test/suite/perfschema/t/setup_objects.test
      mysql-test/suite/perfschema/t/start_server_no_setup_objects-master.opt
      mysql-test/suite/perfschema/t/start_server_no_setup_objects.test
      mysql-test/suite/sys_vars/r/pfs_setup_objects_size_basic.result
      mysql-test/suite/sys_vars/t/pfs_setup_objects_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_setup_objects_size_basic.test
      storage/perfschema/pfs_setup_object.cc
      storage/perfschema/pfs_setup_object.h
      storage/perfschema/table_ews_by_thread_by_event_name.cc
      storage/perfschema/table_ews_by_thread_by_event_name.h
      storage/perfschema/table_helper.cc
      storage/perfschema/table_os_global_by_type.cc
      storage/perfschema/table_os_global_by_type.h
      storage/perfschema/table_setup_objects.cc
      storage/perfschema/table_setup_objects.h
      storage/perfschema/unittest/stub_pfs_defaults.h
      storage/perfschema/unittest/stub_server_misc.h
    renamed:
      storage/perfschema/unittest/stub_server_misc.h => storage/perfschema/unittest/stub_server_misc.h.moved
    modified:
      .bzrignore
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/perfschema/include/schema.inc
      mysql-test/suite/perfschema/include/start_server_common.inc
      mysql-test/suite/perfschema/r/dml_setup_consumers.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/schema_lc0.result
      mysql-test/suite/perfschema/r/schema_lc1.result
      mysql-test/suite/perfschema/r/schema_lc2.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
      mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
      mysql-test/suite/perfschema/r/start_server_no_table_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema_stress/r/modify.result
      mysql-test/suite/perfschema_stress/r/read.result
      mysql-test/suite/perfschema_stress/t/modify.test
      mysql-test/suite/perfschema_stress/t/read.test
      mysql-test/suite/perfschema_stress/t/setup.test
      scripts/mysql_system_tables.sql
      sql/sys_vars.cc
      storage/perfschema/CMakeLists.txt
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_defaults.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_events_waits.cc
      storage/perfschema/pfs_events_waits.h
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/pfs_instr_class.cc
      storage/perfschema/pfs_instr_class.h
      storage/perfschema/pfs_server.cc
      storage/perfschema/pfs_server.h
      storage/perfschema/pfs_stat.h
      storage/perfschema/pfs_timer.cc
      storage/perfschema/pfs_timer.h
      storage/perfschema/table_all_instr.cc
      storage/perfschema/table_all_instr.h
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
      storage/perfschema/table_events_waits_summary.cc
      storage/perfschema/table_events_waits_summary.h
      storage/perfschema/table_ews_global_by_event_name.cc
      storage/perfschema/table_ews_global_by_event_name.h
      storage/perfschema/table_file_summary.cc
      storage/perfschema/table_file_summary.h
      storage/perfschema/table_helper.h
      storage/perfschema/table_setup_consumers.cc
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
      storage/perfschema/unittest/pfs_instr_class-t.cc
 3408 Alexander Barkov	2010-12-02
      WL#5510 Functions to_base64 and from_base64
      
        @ mysql-test/include/ctype_numconv.inc
        @ mysql-test/r/ctype_binary.result
        @ mysql-test/r/ctype_cp1251.result
        @ mysql-test/r/ctype_latin1.result
        @ mysql-test/r/ctype_ucs.result
        @ mysql-test/r/ctype_utf8.result
        @ mysql-test/r/func_str.result
        @ mysql-test/t/func_str.test
          Adding tests
      
        @ mysql-test/suite/binlog/r/binlog_base64_flag.result
        @ mysql-test/suite/binlog/t/binlog_base64_flag.test
          Fixing error from "syntax" error to "base64 decode" error
          for badly formed base64 input.
      
        @ include/base64.h
          Adding prototypes for *_max_arg_length() functions.
      
        @ mysys/base64.c
          Rewriting base64_decode, it's now 30% faster
          (using array instead of of strchr helps with that),
          and rejects garbage in input.
          Adding *_max_arg_length() functions.
      
        @ sql/item_create.cc
          Adding creators
      
        @ sql/item_strfunc.cc
          Implementing Item_func_to_base64 and Item_func_from_base64
      
        @ sql/item_strfunc.h
          Adding prototype for Item_func_to_base64 and Item_func_from_base64
      
        @ sql/sql_binlog.cc
        @ unittest/mysys/base64-t.c
          Passing 0 to the new "flag" argument.

    modified:
      include/base64.h
      mysql-test/include/ctype_numconv.inc
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/func_str.result
      mysql-test/suite/binlog/r/binlog_base64_flag.result
      mysql-test/suite/binlog/t/binlog_base64_flag.test
      mysql-test/t/func_str.test
      mysys/base64.c
      sql/item_create.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/sql_binlog.cc
      unittest/mysys/base64-t.c

Diff too large for email (15444 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-bugfixing branch (marc.alff:3408 to 3409) WL#4816Marc Alff2 Dec