List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:January 12 2011 2:26pm
Subject:bzr commit into mysql-5.5-mtr branch (bjorn.munch:3143)
View as plain text  
#At file:///home/bm136801/my/genplug-55/ based on revid:bjorn.munch@stripped

 3143 Bjorn Munch	2011-01-12 [merge]
      merge from 5.5 main

    removed:
      include/my_no_pthread.h
      mysys/mf_brkhant.c
    modified:
      client/mysqladmin.cc
      cmd-line-utils/readline/CMakeLists.txt
      config.h.cmake
      dbug/dbug.c
      dbug/dbug_analyze.c
      dbug/my_main.c
      dbug/tests.c
      include/CMakeLists.txt
      include/heap.h
      include/my_base.h
      include/my_bitmap.h
      include/my_global.h
      include/my_pthread.h
      include/my_sys.h
      include/myisam.h
      include/thr_alarm.h
      libmysql/client_settings.h
      libmysql/libmysql.c
      mysql-test/collections/default.experimental
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_range.result
      mysql-test/r/subselect.result
      mysql-test/r/subselect4.result
      mysql-test/r/union.result
      mysql-test/r/view_grant.result
      mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
      mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
      mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/partition.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_range.test
      mysql-test/t/subselect.test
      mysql-test/t/subselect4.test
      mysql-test/t/union.test
      mysql-test/t/view_grant.test
      mysys/mf_iocache.c
      mysys/mf_iocache2.c
      mysys/mf_keycache.c
      mysys/mf_keycaches.c
      mysys/my_bitmap.c
      mysys/my_fstream.c
      mysys/my_gethostbyname.c
      mysys/my_getopt.c
      mysys/my_getsystime.c
      mysys/my_init.c
      mysys/my_lib.c
      mysys/my_open.c
      mysys/my_pread.c
      mysys/my_pthread.c
      mysys/my_read.c
      mysys/my_static.c
      mysys/my_thr_init.c
      mysys/my_write.c
      mysys/mysys_priv.h
      mysys/thr_alarm.c
      mysys/thr_lock.c
      mysys/thr_mutex.c
      mysys/thr_rwlock.c
      sql-common/client.c
      sql-common/client_plugin.c
      sql/client_settings.h
      sql/filesort.cc
      sql/handler.cc
      sql/item.h
      sql/item_func.h
      sql/item_subselect.cc
      sql/item_timefunc.h
      sql/net_serv.cc
      sql/sql_admin.cc
      sql/sql_base.cc
      sql/sql_partition.cc
      sql/sql_select.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/table.cc
      storage/heap/heapdef.h
      storage/heap/hp_block.c
      storage/heap/hp_create.c
      storage/heap/hp_open.c
      storage/heap/hp_static.c
      storage/heap/hp_test2.c
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_check.c
      storage/myisam/mi_close.c
      storage/myisam/mi_delete.c
      storage/myisam/mi_delete_all.c
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_log.c
      storage/myisam/mi_open.c
      storage/myisam/mi_static.c
      storage/myisam/mi_statrec.c
      storage/myisam/mi_update.c
      storage/myisam/mi_write.c
      storage/myisam/myisamdef.h
      storage/myisam/sort.c
      storage/myisammrg/myrg_def.h
      tests/thread_test.c

Diff too large for email (20150 lines, the limit is 10000).
No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-5.5-mtr branch (bjorn.munch:3143) Bjorn Munch12 Jan