Merge lp:~denisboyun/drizzle/main_cc_change_part3 into lp:drizzle
- main_cc_change_part3
- Merge into 7.2
Status: | Superseded |
---|---|
Proposed branch: | lp:~denisboyun/drizzle/main_cc_change_part3 |
Merge into: | lp:drizzle |
Diff against target: |
87 lines (+27/-1) 3 files modified
drizzled/main.cc (+7/-1) drizzled/signal_handler.cc (+19/-0) drizzled/signal_handler.h (+1/-0) |
To merge this branch: | bzr merge lp:~denisboyun/drizzle/main_cc_change_part3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Drizzle Trunk | Pending | ||
Review via email: mp+108471@code.launchpad.net |
This proposal has been superseded by a proposal from 2012-06-07.
Commit message
Description of the change
I moved the function which handles sigint signal into drizzled/
Brian Aker (brianaker) wrote : | # |
Brian Aker (brianaker) wrote : | # |
Better :)
We can go with this, though the end game is to create just one signal handle thread.
- 2563. By Drizzle Continuous Integration
-
removed:
tests/crashme_ tests/
tests/crashme_ tests/main/
tests/crashme_ tests/main/ crashme. cnf
tests/dbqp.py
tests/dbqp_data/
tests/kewpie/
tests/kewpie/ .bzrignore
tests/kewpie/lib/
tests/kewpie/ lib/__init_ _.py
tests/kewpie/ lib/modes/ sysbench/
tests/kewpie/ lib/modes/ sysbench/ __init_ _.py
tests/kewpie/ lib/modes/ sysbench/ sysbench_ test_execution. py
tests/kewpie/ lib/modes/ sysbench/ sysbench_ test_management .py
tests/kewpie/ sysbench_ tests/
tests/kewpie/ sysbench_ tests/readonly/
tests/kewpie/ sysbench_ tests/readonly/ concurrency_ 1024.cnf
tests/kewpie/ sysbench_ tests/readonly/ concurrency_ 128.cnf
tests/kewpie/ sysbench_ tests/readonly/ concurrency_ 16.cnf
tests/kewpie/ sysbench_ tests/readonly/ concurrency_ 256.cnf
tests/kewpie/ sysbench_ tests/readonly/ concurrency_ 32.cnf
tests/kewpie/ sysbench_ tests/readonly/ concurrency_ 512.cnf
tests/kewpie/ sysbench_ tests/readonly/ concurrency_ 64.cnf
tests/kewpie/ sysbench_ tests/readwrite /
tests/kewpie/ sysbench_ tests/readwrite /concurrency_ 1024.cnf
tests/kewpie/ sysbench_ tests/readwrite /concurrency_ 128.cnf
tests/kewpie/ sysbench_ tests/readwrite /concurrency_ 16.cnf
tests/kewpie/ sysbench_ tests/readwrite /concurrency_ 256.cnf
tests/kewpie/ sysbench_ tests/readwrite /concurrency_ 32.cnf
tests/kewpie/ sysbench_ tests/readwrite /concurrency_ 512.cnf
tests/kewpie/ sysbench_ tests/readwrite /concurrency_ 64.cnf
tests/lib/dbqp_ modes/
tests/lib/dbqp_ modes/_ _init__ .py
tests/lib/dbqp_ modes/crashme/
tests/lib/dbqp_ modes/crashme/ __init_ _.py
tests/lib/dbqp_ modes/crashme/ crashme_ test_execution. py
tests/lib/dbqp_ modes/crashme/ crashme_ test_management .py
tests/lib/dbqp_ modes/dtr/
tests/lib/dbqp_ modes/dtr/ __init_ _.py
tests/lib/dbqp_ modes/dtr/ dtr_test_ execution. py
tests/lib/dbqp_ modes/dtr/ dtr_test_ management. py
tests/lib/dbqp_ modes/native/
tests/lib/dbqp_ modes/randgen/
tests/lib/dbqp_ modes/randgen/ __init_ _.py
tests/lib/dbqp_ modes/randgen/ randgen_ test_execution. py
tests/lib/dbqp_ modes/randgen/ randgen_ test_management .py
tests/lib/dbqp_ modes/sqlbench/
tests/lib/dbqp_ modes/sqlbench/ __init_ _.py
tests/lib/dbqp_ modes/sqlbench/ sqlbench_ test_execution. py
tests/lib/dbqp_ modes/sqlbench/ sqlbench_ test_management .py
tests/lib/dbqp_ modes/sysbench/
tests/lib/dbqp_ modes/sysbench/ __init_ _.py
tests/lib/dbqp_ modes/sysbench/ sysbench_ test_execution. py
tests/lib/dbqp_ modes/sysbench/ sysbench_ test_management .py
tests/lib/dbqp_ modes/test_ mode.py
tests/lib/dbqp_ opts/
tests/lib/dbqp_ opts/__ init__. py
tests/lib/dbqp_ opts/test_ run_options. py
tests/lib/server_ mgmt/
tests/lib/server_ mgmt/__ init__. py
tests/lib/server_ mgmt/drizzled. py
tests/lib/server_ mgmt/mysqld. py
tests/lib/server_ mgmt/server. py
tests/lib/server_ mgmt/server_ management. py
tests/lib/sys_ mgmt/
tests/lib/sys_ mgmt/__ init__. py
tests/lib/sys_ mgmt/codeTree. py
tests/lib/sys_ mgmt/code_ management. py
tests/lib/sys_ mgmt/environmen t_management. py
tests/lib/sys_ mgmt/logging_ management. py
tests/lib/sys_ mgmt/port_ management. py
tests/lib/sys_ mgmt/system_ management. py
tests/lib/sys_ mgmt/time_ management. py
tests/lib/test_ mgmt/
tests/lib/test_ mgmt/__ init__. py
tests/lib/test_ mgmt/execution_ management. py
tests/lib/test_ mgmt/test_ execution. py
tests/lib/test_ mgmt/test_ management. py
tests/randgen/
tests/randgen/ Contributors
tests/randgen/ LICENSE
tests/randgen/ README
tests/randgen/ backtrace- all.gdb
tests/randgen/ backtrace. gdb
tests/randgen/ bench/
tests/randgen/ bench/WL5004_ sql.yy
tests/randgen/ bench/benchmark .pl
tests/randgen/ bench/falcon_ data_types. zz
tests/randgen/ bughunt_ template. cfg
tests/randgen/ combinations. pl
tests/randgen/ conf/
tests/randgen/ conf/backup/
tests/randgen/ conf/backup/ backup_ interop. yy
tests/randgen/ conf/backup/ backup_ obj.yy
tests/randgen/ conf/backup/ backup_ simple. yy
tests/randgen/ conf/backup/ invariant. yy
tests/randgen/ conf/backup/ invariant. zz
tests/randgen/ conf/dbt3/
tests/randgen/ conf/dbt3/ dbt3-dml. yy
tests/randgen/ conf/dbt3/ dbt3-joins. yy
tests/randgen/ conf/dbt3/ dbt3-ranges. yy
tests/randgen/ conf/dbt3/ dbt3-s0. 0001.dump
tests/randgen/ conf/dbt3/ dbt3-s0. 001.dump
tests/randgen/ conf/dbt3/ dbt3-s0. 01.dump. bz2
tests/randgen/ conf/drizzle/
tests/randgen/ conf/drizzle/bug680669.yy
tests/randgen/ conf/drizzle/ collations_ drizzle. yy
tests/randgen/ conf/drizzle/ combinations_ drizzle. zz
tests/randgen/ conf/drizzle/ data_dict_ concurrent_ drizzle. yy
tests/randgen/ conf/drizzle/ drizzle. yy
tests/randgen/ conf/drizzle/ drizzle. zz
tests/randgen/ conf/drizzle/ drizzledump. yy
tests/randgen/ conf/drizzle/ drizzledump_ migrate. yy
tests/randgen/ conf/drizzle/ drizzledump_ migrate. zz
tests/randgen/ conf/drizzle/ limit_compare_ drizzle. yy
tests/randgen/ conf/drizzle/ many_indexes_ drizzle. yy
tests/randgen/ conf/drizzle/ many_indexes_ drizzle. zz
tests/randgen/ conf/drizzle/ optimizer_ subquery_ data_dictionary _drizzle. yy
tests/randgen/ conf/drizzle/ optimizer_ subquery_ drizzle. yy
tests/randgen/ conf/drizzle/ outer_join_ data_dictionary _drizzle. yy
tests/randgen/ conf/drizzle/ outer_join_ drizzle. yy
tests/randgen/ conf/drizzle/ outer_join_ drizzle. zz
tests/randgen/ conf/drizzle/ outer_join_ portable_ drizzle. yy
tests/randgen/ conf/drizzle/ proclist_ drizzle. yy
tests/randgen/ conf/drizzle/ proclist_ subquery_ drizzle. yy
tests/randgen/ conf/drizzle/ range_access_ drizzle. yy
tests/randgen/ conf/drizzle/ range_access_ drizzle. zz
tests/randgen/ conf/drizzle/ subquery_ drizzle. yy
tests/randgen/ conf/drizzle/ subquery_ materialization _drizzle. yy
tests/randgen/ conf/drizzle/ subquery_ semijoin_ drizzle. yy
tests/randgen/ conf/drizzle/ subquery_ semijoin_ nested_ drizzle. yy
tests/randgen/ conf/drizzle/ translog_ concurrent1. yy
tests/randgen/ conf/drizzle/ translog_ concurrent2. yy
tests/randgen/ conf/drizzle/ translog_ concurrent3. yy
tests/randgen/ conf/drizzle/ translog_ drizzle. zz
tests/randgen/ conf/drizzle/ translog_ ordering. yy
tests/randgen/ conf/drizzle/ translog_ ordering. zz
tests/randgen/ conf/drizzle/ varchar_ drizzle. zz
tests/randgen/ conf/dyncol/
tests/randgen/ conf/dyncol/ dyncol_ dml.yy
tests/randgen/ conf/dyncol/ dyncol_ dml.zz
tests/randgen/ conf/engines/
tests/randgen/ conf/engines/ blobs.yy
tests/randgen/ conf/engines/ engine_ stress. yy
tests/randgen/ conf/engines/ engine_ stress. zz
tests/randgen/ conf/engines/ falcon/
tests/randgen/ conf/engines/ falcon/ falcon_ backlog. yy
tests/randgen/ conf/engines/ falcon/ falcon_ backlog. zz
tests/randgen/ conf/engines/ falcon/ falcon_ blobs.yy
tests/randgen/ conf/engines/ falcon/ falcon_ blobs.zz
tests/randgen/ conf/engines/ falcon/ falcon_ chill_thaw. yy
tests/randgen/ conf/engines/ falcon/ falcon_ chill_thaw. zz
tests/randgen/ conf/engines/ falcon/ falcon_ data_types. yy
tests/randgen/ conf/engines/ falcon/ falcon_ data_types. zz
tests/randgen/ conf/engines/ falcon/ falcon_ data_types_ no_year_ time.yy
tests/randgen/ conf/engines/ falcon/ falcon_ data_types_ no_year_ time.zz
tests/randgen/ conf/engines/ falcon/ falcon_ ddl.yy
tests/randgen/ conf/engines/ falcon/ falcon_ limit.yy
tests/randgen/ conf/engines/ falcon/ falcon_ nolimit. yy
tests/randgen/ conf/engines/ falcon/ falcon_ nolimit_ int.yy
tests/randgen/ conf/engines/ falcon/ falcon_ online_ alter.yy
tests/randgen/ conf/engines/ falcon/ falcon_ pagesize. yy
tests/randgen/ conf/engines/ falcon/ falcon_ pagesize2K. zz
tests/randgen/ conf/engines/ falcon/ falcon_ pagesize32K. zz
tests/randgen/ conf/engines/ falcon/ falcon_ recovery. yy
tests/randgen/ conf/engines/ falcon/ falcon_ recovery. zz
tests/randgen/ conf/engines/ falcon/ falcon_ replication. yy
tests/randgen/ conf/engines/ falcon/ falcon_ replication. zz
tests/randgen/ conf/engines/ falcon/ falcon_ select_ autocommit. yy
tests/randgen/ conf/engines/ falcon/ falcon_ simple. cc
tests/randgen/ conf/engines/ falcon/ falcon_ varchar. cc
tests/randgen/ conf/engines/ falcon/ limit_compare. yy
tests/randgen/ conf/engines/ handler. yy
tests/randgen/ conf/engines/ handler. zz
tests/randgen/ conf/engines/ heap/
tests/randgen/ conf/engines/ heap/heap_ ddl_multi. yy
tests/randgen/ conf/engines/ heap/heap_ dml_single. init
tests/randgen/ conf/engines/ heap/heap_ dml_single. yy
tests/randgen/ conf/engines/ innodb/
tests/randgen/ conf/engines/ innodb/ innodb_ simple. cc
tests/randgen/ conf/engines/ many_indexes. yy
tests/randgen/ conf/engines/ many_indexes. zz
tests/randgen/ conf/engines/ maria/
tests/randgen/ conf/engines/ maria/maria. zz
tests/randgen/ conf/engines/ maria/maria_ bulk_insert. yy
tests/randgen/ conf/engines/ maria/maria_ dml_alter. yy
tests/randgen/ conf/engines/ maria/maria_ mostly_ selects. yy
tests/randgen/ conf/engines/ maria/maria_ recovery. cc
tests/randgen/ conf/engines/ maria/maria_ stress. yy
tests/randgen/ conf/engines/ tiny_inserts. yy
tests/randgen/ conf/engines/ tiny_inserts. zz
tests/randgen/ conf/engines/ varchar. yy
tests/randgen/ conf/engines/ varchar. zz
tests/randgen/ conf/examples/
tests/randgen/ conf/examples/ example. ff
tests/randgen/ conf/examples/ example. yy
tests/randgen/ conf/examples/ example. zz
tests/randgen/ conf/examples/ flightstats. yy
tests/randgen/ conf/hivol/
tests/randgen/ conf/hivol/ hivol_fbase_ small.yy
tests/randgen/ conf/hivol/ hivol_film. yy
tests/randgen/ conf/i18n/
tests/randgen/ conf/i18n/ collations. yy
tests/randgen/ conf/optimizer/
tests/randgen/ conf/optimizer/ archive/
tests/randgen/ conf/optimizer/ archive/ subquery_ materialization .yy
tests/randgen/ conf/optimizer/ archive/ subquery_ semijoin. yy
tests/randgen/ conf/optimizer/ archive/ subquery_ semijoin_ nested. yy
tests/randgen/ conf/optimizer/ dsmrr-cpk- compare. cc
tests/randgen/ conf/optimizer/ dsmrr-cpk- single. cc
tests/randgen/ conf/optimizer/ dsmrr-cpk. ff
tests/randgen/ conf/optimizer/ intersect. ff
tests/randgen/ conf/optimizer/ join_buffer. ff
tests/randgen/ conf/optimizer/ mrr-single. cc
tests/randgen/ conf/optimizer/ mrr.ff
tests/randgen/ conf/optimizer/ optimizer_ access_ exp.yy
tests/randgen/ conf/optimizer/ optimizer_ no_subquery. yy
tests/randgen/ conf/optimizer/ optimizer_ no_subquery_ portable. yy
tests/randgen/ conf/optimizer/ optimizer_ subquery. yy
tests/randgen/ conf/optimizer/ optimizer_ subquery_ no_outer_ join.yy
tests/randgen/ conf/optimizer/ optimizer_ subquery_ portable. yy
tests/randgen/ conf/optimizer/ outer_join. yy
tests/randgen/ conf/optimizer/ outer_join. zz
tests/randgen/ conf/optimizer/ outer_join_ portable. yy
tests/randgen/ conf/optimizer/ range_access. ff
tests/randgen/ conf/optimizer/ range_access. yy
tests/randgen/ conf/optimizer/ range_access. zz
tests/randgen/ conf/optimizer/ range_access2. yy
tests/randgen/ conf/optimizer/ range_access2. zz
tests/randgen/ conf/optimizer/ sort_union- index_merge. ff
tests/randgen/ conf/optimizer/ virtual_ columns. yy
tests/randgen/ conf/oqgraph/
tests/randgen/ conf/oqgraph/ oqgraph. init
tests/randgen/ conf/oqgraph/ oqgraph. yy
tests/randgen/ conf/oqgraph/ oqgraph_ bulgaria. sql.bz2
tests/randgen/ conf/oqgraph/ osm2oqg. pl
tests/randgen/ conf/osm/
tests/randgen/ conf/osm/ LICENCE
tests/randgen/ conf/osm/ andorra. sql
tests/randgen/ conf/osm/ osm-schema. sql
tests/randgen/ conf/partitioni ng/
tests/randgen/ conf/partitioni ng/partition_ pruning. yy
tests/randgen/ conf/partitioni ng/partition_ pruning. zz
tests/randgen/ conf/partitioni ng/partitions- ddl.yy
tests/randgen/ conf/partitioni ng/partitions- wl4571. yy
tests/randgen/ conf/partitioni ng/partitions_ procedures_ triggers. yy
tests/randgen/ conf/replicatio n/
tests/randgen/ conf/replicatio n/WL5092_ data.zz
tests/randgen/ conf/replicatio n/WL5092_ sql_1.yy
tests/randgen/ conf/replicatio n/WL5092_ sql_2.yy
tests/randgen/ conf/replicatio n/replication- 5.1.zz
tests/randgen/ conf/replicatio n/replication- 6.0.zz
tests/randgen/ conf/replicatio n/replication- ddl_data. zz
tests/randgen/ conf/replicatio n/replication- ddl_sql. yy
tests/randgen/ conf/replicatio n/replication- dml_data. zz
tests/randgen/ conf/replicatio n/replication- dml_sql. yy
tests/randgen/ conf/replicatio n/replication. yy
tests/randgen/ conf/replicatio n/replication_ innodb_ myisam. zz
tests/randgen/ conf/replicatio n/replication_ simple. yy
tests/randgen/ conf/replicatio n/replication_ single_ engine. zz
tests/randgen/ conf/replicatio n/replication_ single_ engine_ pk.zz
tests/randgen/ conf/replicatio n/rpl_transacti ons.yy
tests/randgen/ conf/replicatio n/rpl_transacti ons.zz
tests/randgen/ conf/replicatio n/rpl_transacti ons_nopk. zz
tests/randgen/ conf/runtime/
tests/randgen/ conf/runtime/ WL5004_ data.zz
tests/randgen/ conf/runtime/ WL5004_ sql.yy
tests/randgen/ conf/runtime/ WL5004_ sql_custom. yy
tests/randgen/ conf/runtime/ connect_ kill_data. zz
tests/randgen/ conf/runtime/ connect_ kill_sql. yy
tests/randgen/ conf/runtime/ create_ drop.yy
tests/randgen/ conf/runtime/ information_ schema. yy
tests/randgen/ conf/runtime/ metadata_ locking. cc
tests/randgen/ conf/runtime/ metadata_ stability. yy
tests/randgen/ conf/runtime/ metadata_ stability. zz
tests/randgen/ conf/runtime/ performance_ schema. yy
tests/randgen/ conf/runtime/ signal_ resignal. yy
tests/randgen/ conf/temporal/
tests/randgen/ conf/temporal/ temporal_ functions. yy
tests/randgen/ conf/temporal/ temporal_ functions. zz
tests/randgen/ conf/temporal/ temporal_ ranges. yy
tests/randgen/ conf/temporal/ temporal_ ranges. zz
tests/randgen/ conf/temporal/ temporal_ replication. yy
tests/randgen/ conf/transactio ns/
tests/randgen/ conf/transactio ns/combinations .yy
tests/randgen/ conf/transactio ns/combinations .zz
tests/randgen/ conf/transactio ns/repeatable_ read.yy
tests/randgen/ conf/transactio ns/transaction_ durability. yy
tests/randgen/ conf/transactio ns/transactions -flat.yy
tests/randgen/ conf/transactio ns/transactions .yy
tests/randgen/ conf/transactio ns/transactions .zz
tests/randgen/ data/
tests/randgen/ data/earth11k. jpg
tests/randgen/ data/earth15kb. jpg
tests/randgen/ data/earth1886k b.jpg
tests/randgen/ data/earth215kb .jpg
tests/randgen/ data/earth2kb. jpg
tests/randgen/ data/earth579kb .jpg
tests/randgen/ data/earth5kb. jpg
tests/randgen/ data/earth81kb. jpg
tests/randgen/ dict/
tests/randgen/ dict/english. txt
tests/randgen/ dict/states. txt
tests/randgen/ gendata- old.pl
tests/randgen/ gendata. pl
tests/randgen/ gengrammar. pl
tests/randgen/ gensql. pl
tests/randgen/ gentest. pl
tests/randgen/ init/
tests/randgen/ init/all_ off.sql
tests/randgen/ init/mrr_ no_opt. sql
tests/randgen/ init/mrr_ opt.sql
tests/randgen/ init/no_ materialization .sql
tests/randgen/ init/no_ mrr.opt
tests/randgen/ init/no_ mrr_no_ opt.sql
tests/randgen/ init/no_ mrr_opt. sql
tests/randgen/ init/no_ semijoin. sql
tests/randgen/ init/no_ subquery. sql
tests/randgen/ lib/
tests/randgen/ lib/DBServer/
tests/randgen/ lib/DBServer/ DBServer. pm
tests/randgen/ lib/DBServer/ MySQL/
tests/randgen/ lib/DBServer/ MySQL/MySQLd. pm
tests/randgen/ lib/DBServer/ MySQL/ReplMySQL d.pm
tests/randgen/ lib/GenTest/
tests/randgen/ lib/GenTest. pm
tests/randgen/ lib/GenTest/ App/
tests/randgen/ lib/GenTest/ App/GenTest. pm
tests/randgen/ lib/GenTest/ App/Gendata. pm
tests/randgen/ lib/GenTest/ App/GendataSimp le.pm
tests/randgen/ lib/GenTest/ BzrInfo. pm
tests/randgen/ lib/GenTest/ Comparator. pm
tests/randgen/ lib/GenTest/ Constants. pm
tests/randgen/ lib/GenTest/ ErrorFilter. pm
tests/randgen/ lib/GenTest/ Executor/
tests/randgen/ lib/GenTest/ Executor. pm
tests/randgen/ lib/GenTest/ Executor/ Drizzle. pm
tests/randgen/ lib/GenTest/ Executor/ Dummy.pm
tests/randgen/ lib/GenTest/ Executor/ JavaDB. pm
tests/randgen/ lib/GenTest/ Executor/ MySQL.pm
tests/randgen/ lib/GenTest/ Executor/ MySQLPrepared. pm
tests/randgen/ lib/GenTest/ Executor/ Postgres. pm
tests/randgen/ lib/GenTest/ Filter/
tests/randgen/ lib/GenTest/ Filter/ Regexp. pm
tests/randgen/ lib/GenTest/ Generator/
tests/randgen/ lib/GenTest/ Generator. pm
tests/randgen/ lib/GenTest/ Generator/ FromGrammar. pm
tests/randgen/ lib/GenTest/ Grammar/
tests/randgen/ lib/GenTest/ Grammar. pm
tests/randgen/ lib/GenTest/ Grammar/ Rule.pm
tests/randgen/ lib/GenTest/ IPC/
tests/randgen/ lib/GenTest/ IPC/Channel. pm
tests/randgen/ lib/GenTest/ IPC/Process. pm
tests/randgen/ lib/GenTest/ Incident. pm
tests/randgen/ lib/GenTest/ Mixer/
tests/randgen/ lib/GenTest/ Mixer.pm
tests/randgen/ lib/GenTest/ Properties. pm
tests/randgen/ lib/GenTest/ Random. pm
tests/randgen/ lib/GenTest/ Reporter/
tests/randgen/ lib/GenTest/ Reporter. pm
tests/randgen/ lib/GenTest/ Reporter/ AriaDoubleRecov ery.pm
tests/randgen/ lib/GenTest/ Reporter/ Backtrace. pm
tests/randgen/ lib/GenTest/ Reporter/ BackupAndRestor e.pm
tests/randgen/ lib/GenTest/ Reporter/ BackupAndRestor eInvariant. pm
tests/randgen/ lib/GenTest/ Reporter/ BackupInterop. pm
tests/randgen/ lib/GenTest/ Reporter/ CloneSlave. pm
tests/randgen/ lib/GenTest/ Reporter/ CloneSlaveXtrab ackup.pm
tests/randgen/ lib/GenTest/ Reporter/ DatabaseConsist ency.pm
tests/randgen/ lib/GenTest/ Reporter/ Deadlock. pm
tests/randgen/ lib/GenTest/ Reporter/ DrizzleInnoTrxL og.pm
tests/randgen/ lib/GenTest/ Reporter/ DrizzleInnoTrxL ogCrashRecovery .pm
tests/randgen/ lib/GenTest/ Reporter/ DrizzleRecovery .pm
tests/randgen/ lib/GenTest/ Reporter/ DrizzleRecovery Consistency. pm
tests/randgen/ lib/GenTest/ Reporter/ DrizzleSlavePlu gin.pm
tests/randgen/ lib/GenTest/ Reporter/ DrizzleSlavePlu ginCrashRecover .pm
tests/randgen/ lib/GenTest/ Reporter/ DrizzleTransact ionLog. pm
tests/randgen/ lib/GenTest/ Reporter/ ErrorLog. pm
tests/randgen/ lib/GenTest/ Reporter/ ErrorLogAlarm. pm
tests/randgen/ lib/GenTest/ Reporter/ LockTableKiller .pm
tests/randgen/ lib/GenTest/ Reporter/ MemoryUsage. pm
tests/randgen/ lib/GenTest/ Reporter/ MySQLClient. pm
tests/randgen/ lib/GenTest/ Reporter/ QueryTimeout. pm
tests/randgen/ lib/GenTest/ Reporter/ Recovery. pm
tests/randgen/ lib/GenTest/ Reporter/ RecoveryConsist ency.pm
tests/randgen/ lib/GenTest/ Reporter/ ReplicationAnal yzeTable. pm
tests/randgen/ lib/GenTest/ Reporter/ ReplicationConn ectionKiller. pm
tests/randgen/ lib/GenTest/ Reporter/ ReplicationCons istency. pm
tests/randgen/ lib/GenTest/ Reporter/ ReplicationLogF lusher. pm
tests/randgen/ lib/GenTest/ Reporter/ ReplicationSemi Sync.pm
tests/randgen/ lib/GenTest/ Reporter/ ReplicationThre adRestarter. pm
tests/randgen/ lib/GenTest/ Reporter/ Shutdown. pm
tests/randgen/ lib/GenTest/ Reporter/ ValgrindXMLErro rs.pm
tests/randgen/ lib/GenTest/ Reporter/ WinPackage. pm
tests/randgen/ lib/GenTest/ ReporterManager .pm
tests/randgen/ lib/GenTest/ Result. pm
tests/randgen/ lib/GenTest/ Server/
tests/randgen/ lib/GenTest/ SimPipe/
tests/randgen/ lib/GenTest/ SimPipe/ DBObject. pm
tests/randgen/ lib/GenTest/ SimPipe/ Oracle/
tests/randgen/ lib/GenTest/ SimPipe/ Oracle. pm
tests/randgen/ lib/GenTest/ SimPipe/ Oracle/ Crash.pm
tests/randgen/ lib/GenTest/ SimPipe/ Oracle/ FullScan. pm
tests/randgen/ lib/GenTest/ SimPipe/ Oracle/ TwiceSporadic. pm
tests/randgen/ lib/GenTest/ SimPipe/ Testcase. pm
tests/randgen/ lib/GenTest/ Simplifier/
tests/randgen/ lib/GenTest/ Simplifier/ Grammar. pm
tests/randgen/ lib/GenTest/ Simplifier/ Mysqltest. pm
tests/randgen/ lib/GenTest/ Simplifier/ SQL.pm
tests/randgen/ lib/GenTest/ Simplifier/ Tables. pm
tests/randgen/ lib/GenTest/ Simplifier/ Test.pm
tests/randgen/ lib/GenTest/ Stack/
tests/randgen/ lib/GenTest/ Stack/Stack. pm
tests/randgen/ lib/GenTest/ Stack/StackFram e.pm
tests/randgen/ lib/GenTest/ Statement. pm
tests/randgen/ lib/GenTest/ Transform/
tests/randgen/ lib/GenTest/ Transform. pm
tests/randgen/ lib/GenTest/ Transform/ ConvertLiterals ToSubqueries. pm
tests/randgen/ lib/GenTest/ Transform/ ConvertSubqueri esToViews. pm
tests/randgen/ lib/GenTest/ Transform/ Count.pm
tests/randgen/ lib/GenTest/ Transform/ DisableChosenPl an.pm
tests/randgen/ lib/GenTest/ Transform/ DisableIndexes. pm
tests/randgen/ lib/GenTest/ Transform/ DisableJoinCach e.pm
tests/randgen/ lib/GenTest/ Transform/ Distinct. pm
tests/randgen/ lib/GenTest/ Transform/ DrizzleExecuteS tring.pm
tests/randgen/ lib/GenTest/ Transform/ DrizzleExecuteV ariable. pm
tests/randgen/ lib/GenTest/ Transform/ Dummy.pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsFuncti onTwice. pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsInsert Select. pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsPrepar edTwice. pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsSPTwic e.pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsSelect Item.pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsTrigge r.pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsUnion. pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsUpdate Delete. pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsView. pm
tests/randgen/ lib/GenTest/ Transform/ ExecuteAsWhereS ubquery. pm
tests/randgen/ lib/GenTest/ Transform/ FromSubquery. pm
tests/randgen/ lib/GenTest/ Transform/ Having. pm
tests/randgen/ lib/GenTest/ Transform/ InlineSubquerie s.pm
tests/randgen/ lib/GenTest/ Transform/ InlineVirtualCo lumns.pm
tests/randgen/ lib/GenTest/ Transform/ LimitDecrease. pm
tests/randgen/ lib/GenTest/ Transform/ LimitIncrease. pm
tests/randgen/ lib/GenTest/ Transform/ OrderBy. pm
tests/randgen/ lib/GenTest/ Transform/ RemoveIndexHint s.pm
tests/randgen/ lib/GenTest/ Transform/ SelectOption. pm
tests/randgen/ lib/GenTest/ Transform/ StraightJoin. pm
tests/randgen/ lib/GenTest/ Translator/
tests/randgen/ lib/GenTest/ Translator. pm
tests/randgen/ lib/GenTest/ Translator/ MysqlDML2ANSI. pm
tests/randgen/ lib/GenTest/ Translator/ MysqlDML2javadb .pm
tests/randgen/ lib/GenTest/ Translator/ MysqlDML2pgsql. pm
tests/randgen/ lib/GenTest/ Translator/ Mysqldump2ANSI. pm
tests/randgen/ lib/GenTest/ Translator/ Mysqldump2javad b.pm
tests/randgen/ lib/GenTest/ Translator/ Mysqldump2pgsql .pm
tests/randgen/ lib/GenTest/ Validator/
tests/randgen/ lib/GenTest/ Validator. pm
tests/randgen/ lib/GenTest/ Validator/ AbortOnSyntaxEr ror.pm
tests/randgen/ lib/GenTest/ Validator/ DML.pm
tests/randgen/ lib/GenTest/ Validator/ DatabaseCompara tor.pm
tests/randgen/ lib/GenTest/ Validator/ DatabaseConsist ency.pm
tests/randgen/ lib/GenTest/ Validator/ DrizzleErrorLog Scan.pm
tests/randgen/ lib/GenTest/ Validator/ DrizzleTransfor mer.pm
tests/randgen/ lib/GenTest/ Validator/ Drizzledump. pm
tests/randgen/ lib/GenTest/ Validator/ DrizzledumpMigr ate.pm
tests/randgen/ lib/GenTest/ Validator/ ErrorMessageCor ruption. pm
tests/randgen/ lib/GenTest/ Validator/ ExecutionTimeCo mparator. pm
tests/randgen/ lib/GenTest/ Validator/ ExplainMatch. pm
tests/randgen/ lib/GenTest/ Validator/ ExplicitRollbac k.pm
tests/randgen/ lib/GenTest/ Validator/ Falcon. pm
tests/randgen/ lib/GenTest/ Validator/ FalconErrors. pm
tests/randgen/ lib/GenTest/ Validator/ Invariant. pm
tests/randgen/ lib/GenTest/ Validator/ Limit.pm
tests/randgen/ lib/GenTest/ Validator/ MarkErrorLog. pm
tests/randgen/ lib/GenTest/ Validator/ OptimizerTraceP arser.pm
tests/randgen/ lib/GenTest/ Validator/ OrderBy. pm
tests/randgen/ lib/GenTest/ Validator/ QueryProperties .pm
tests/randgen/ lib/GenTest/ Validator/ RepeatableRead. pm
tests/randgen/ lib/GenTest/ Validator/ ReplicationSlav eStatus. pm
tests/randgen/ lib/GenTest/ Validator/ ReplicationWait ForSlave. pm
tests/randgen/ lib/GenTest/ Validator/ ResultsetCompar ator.pm
tests/randgen/ lib/GenTest/ Validator/ ResultsetCompar ator3.pm
tests/randgen/ lib/GenTest/ Validator/ ResultsetCompar ator3Simplify. pm
tests/randgen/ lib/GenTest/ Validator/ ResultsetCompar atorSimplify. pm
tests/randgen/ lib/GenTest/ Validator/ ResultsetCorrup tion.pm
tests/randgen/ lib/GenTest/ Validator/ SelectStability .pm
tests/randgen/ lib/GenTest/ Validator/ Transformer. pm
tests/randgen/ lib/GenTest/ Validator/ Transformer2. pm
tests/randgen/ lib/GenTest/ XML/
tests/randgen/ lib/GenTest/ XML/BuildInfo. pm
tests/randgen/ lib/GenTest/ XML/Environment .pm
tests/randgen/ lib/GenTest/ XML/Report. pm
tests/randgen/ lib/GenTest/ XML/Test. pm
tests/randgen/ lib/GenTest/ XML/Transporter .pm
tests/randgen/ pb2combinations .pl
tests/randgen/ pb2gentest- new.pl
tests/randgen/ pb2gentest. pl
tests/randgen/ pb2runtest. pl
tests/randgen/ runall- new.pl
tests/randgen/ runall. pl
tests/randgen/ server. pl
tests/randgen/ simpipe- crash.pl
tests/randgen/ simpipe. pl
tests/randgen/ simplify- grammar_ template. cfg
tests/randgen/ simplify- mysqltest_ template- huge.cfg
tests/randgen/ simplify- mysqltest_ template. cfg
tests/randgen/t/
tests/randgen/ t/constant. t
tests/randgen/ t/gensql. t
tests/randgen/ t/gensql. yy
tests/randgen/ t/gentest. t
tests/randgen/ t/grammar- doubledefine. t.disabled
tests/randgen/ t/grammar- doubledefine. yy
tests/randgen/ t/grammar. t
tests/randgen/ t/prng. t
tests/randgen/ t/simplify- empty.t
tests/randgen/ t/simplify- empty.yy
tests/randgen/ t/simplify- grammar. t
tests/randgen/ t/simplify- grammar. yy
tests/randgen/ t/test. bat
tests/randgen/ tmp/
tests/randgen/ translateMysql. pl
tests/randgen/ unit/
tests/randgen/ unit/DBDVersion .pm
tests/randgen/ unit/ExecutorTe st.pm
tests/randgen/ unit/FromGramma rTest.pm
tests/randgen/ unit/GendataTes t.pm
tests/randgen/ unit/GendataTes t.zz
tests/randgen/ unit/GrammarTes t.pm
tests/randgen/ unit/IPC. pm
tests/randgen/ unit/IPC_ P1.pm
tests/randgen/ unit/Metadata. pm
tests/randgen/ unit/ParseAllGr ammars. pm
tests/randgen/ unit/README
tests/randgen/ unit/RQGRunner. pm
tests/randgen/ unit/RandomTest .pm
tests/randgen/ unit/Suite. pm
tests/randgen/ unit/TestMySQLS erver.pm
tests/randgen/ unit/TestReplSe rver.pm
tests/randgen/ unit/TestScript s.pm
tests/randgen/ unit/testGramma r.yy
tests/randgen/ unit/testStack. yy
tests/randgen/ unit/unit. pl
tests/randgen/ util/
tests/randgen/ util/bughunt. pl
tests/randgen/ util/dump- test.pl
tests/randgen/ util/mask- grammar. pl
tests/randgen/ util/simplify- crash.pl
tests/randgen/ util/simplify- grammar. pl
tests/randgen/ util/simplify- mysqltest. pl
tests/randgen/ util/simplify- query-performan ce.pl
tests/randgen/ util/simplify- query.pl
tests/randgen/ util/simplify- sporadic. pl
tests/randgen_ tests/
tests/randgen_ tests/innodb_ trx_log/
tests/randgen_ tests/innodb_ trx_log/ multi_thread1. cnf
tests/randgen_ tests/innodb_ trx_log/ multi_thread1_ crash_recover. cnf
tests/randgen_ tests/innodb_ trx_log/ multi_thread1_ mix.cnf
tests/randgen_ tests/innodb_ trx_log/ multi_thread2. cnf
tests/randgen_ tests/innodb_ trx_log/ multi_thread2_ mix.cnf
tests/randgen_ tests/innodb_ trx_log/ multi_thread3. cnf
tests/randgen_ tests/innodb_ trx_log/ multi_thread3_ mix.cnf
tests/randgen_ tests/innodb_ trx_log/ single_ thread3. cnf
tests/randgen_ tests/innodb_ trx_log/ trx_ordering. cnf
tests/randgen_ tests/main/
tests/randgen_ tests/main/ basic.cnf
tests/randgen_ tests/main/ blob.cnf
tests/randgen_ tests/main/ collations. cnf
tests/randgen_ tests/main/ combinations. cnf
tests/randgen_ tests/main/ create_ drop.cnf
tests/randgen_ tests/main/ database_ consistency_ after_recovery. disabled
tests/randgen_ tests/main/ database_ integrity_ after_recovery. cnf
tests/randgen_ tests/main/ drizzledump_ restore. cnf
tests/randgen_ tests/main/ drizzledump_ restore_ rand.cnf
tests/randgen_ tests/main/ limit_compare. cnf
tests/randgen_ tests/main/ many_indexes. cnf
tests/randgen_ tests/main/ optimizer_ subquery. cnf
tests/randgen_ tests/main/ orderby_ validator. disabled
tests/randgen_ tests/main/ outer_join. cnf
tests/randgen_ tests/main/ outer_join_ portable. cnf
tests/randgen_ tests/main/ repeatable_ read.cnf
tests/randgen_ tests/main/ select_ stability_ validator. cnf
tests/randgen_ tests/main/ subquery. cnf
tests/randgen_ tests/main/ subquery_ semijoin. cnf
tests/randgen_ tests/main/ subquery_ semijoin_ nested. cnf
tests/randgen_ tests/main/ varchar. cnf
tests/randgen_ tests/slave_ plugin/
tests/randgen_ tests/slave_ plugin/ multi_thread1. cnf
tests/randgen_ tests/slave_ plugin/ multi_thread1_ crash_recover. cnf
tests/randgen_ tests/slave_ plugin/ multi_thread1_ mix.cnf
tests/randgen_ tests/slave_ plugin/ multi_thread2. cnf
tests/randgen_ tests/slave_ plugin/ multi_thread2_ mix.cnf
tests/randgen_ tests/slave_ plugin/ multi_thread3. cnf
tests/randgen_ tests/slave_ plugin/ multi_thread3_ mix.cnf
tests/randgen_ tests/slave_ plugin/ single_ thread3. cnf
tests/randgen_ tests/slave_ plugin/ trx_ordering. cnf
tests/randgen_ tests/trx_ log/
tests/randgen_ tests/trx_ log/multi_ thread1. cnf
tests/randgen_ tests/trx_ log/multi_ thread1_ mix.cnf
tests/randgen_ tests/trx_ log/multi_ thread2. cnf
tests/randgen_ tests/trx_ log/multi_ thread2_ mix.cnf
tests/randgen_ tests/trx_ log/multi_ thread3. cnf
tests/randgen_ tests/trx_ log/multi_ thread3_ mix.cnf
tests/randgen_ tests/trx_ log/single_ thread3. cnf
tests/randgen_ tests/trx_ log/trx_ ordering. cnf
tests/sql-bench/
tests/sql-bench/ COPYING
tests/sql-bench/ Comments/
tests/sql-bench/ Comments/ Access. crash-me
tests/sql-bench/ Comments/ Adabas. crash-me
tests/sql-bench/ Comments/ Empress. crash-me
tests/sql-bench/ Comments/ FrontBase. benchmark
tests/sql-bench/ Comments/ Informix. crash-me
tests/sql-bench/ Comments/ interbase
tests/sql-bench/ Comments/ mysql.benchmark
tests/sql-bench/ Comments/ postgres. benchmark
tests/sql-bench/ Comments/ postgres. crash-me
tests/sql-bench/ Data/
tests/sql-bench/ Data/ATIS/
tests/sql-bench/ Data/ATIS/ aircraft. txt
tests/sql-bench/ Data/ATIS/ airline. txt
tests/sql-bench/ Data/ATIS/ airport. txt
tests/sql-bench/ Data/ATIS/ airport_ service. txt
tests/sql-bench/ Data/ATIS/ city.txt
tests/sql-bench/ Data/ATIS/ class_of_ service. txt
tests/sql-bench/ Data/ATIS/ code_descriptio n.txt
tests/sql-bench/ Data/ATIS/ compound_ class.txt
tests/sql-bench/ Data/ATIS/ connect_ leg.txt
tests/sql-bench/ Data/ATIS/ date_day. txt
tests/sql-bench/ Data/ATIS/ day_name. txt
tests/sql-bench/ Data/ATIS/ dual_carrier. txt
tests/sql-bench/ Data/ATIS/ fare.txt
tests/sql-bench/ Data/ATIS/ fconnection. txt
tests/sql-bench/ Data/ATIS/ flight. txt
tests/sql-bench/ Data/ATIS/ flight_ class.txt
tests/sql-bench/ Data/ATIS/ flight_ day.txt
tests/sql-bench/ Data/ATIS/ flight_ fare.txt
tests/sql-bench/ Data/ATIS/ food_service. txt
tests/sql-bench/ Data/ATIS/ ground_ service. txt
tests/sql-bench/ Data/ATIS/ month_name. txt
tests/sql-bench/ Data/ATIS/ restrict_ carrier. txt
tests/sql-bench/ Data/ATIS/ restrict_ class.txt
tests/sql-bench/ Data/ATIS/ restriction. txt
tests/sql-bench/ Data/ATIS/ state.txt
tests/sql-bench/ Data/ATIS/ stop.txt
tests/sql-bench/ Data/ATIS/ stop1.txt
tests/sql-bench/ Data/ATIS/ time_interval. txt
tests/sql-bench/ Data/ATIS/ time_zone. txt
tests/sql-bench/ Data/ATIS/ transport. txt
tests/sql-bench/ Data/Wisconsin/
tests/sql-bench/ Data/Wisconsin/ onek.data
tests/sql-bench/ Data/Wisconsin/ tenk.data
tests/sql-bench/ Makefile. am
tests/sql-bench/ README
tests/sql-bench/ TODO
tests/sql-bench/ as3ap
tests/sql-bench/ bench-count- distinct
tests/sql-bench/ bench-init. pl
tests/sql-bench/ compare- results
tests/sql-bench/ copy-db
tests/sql-bench/ crash-me
tests/sql-bench/ example
tests/sql-bench/ example. bat
tests/sql-bench/ graph-compare- results
tests/sql-bench/ innotest1
tests/sql-bench/ innotest1a
tests/sql-bench/ innotest1b
tests/sql-bench/ innotest2
tests/sql-bench/ innotest2a
tests/sql-bench/ innotest2b
tests/sql-bench/ limits/
tests/sql-bench/ limits/ Adabas. cfg
tests/sql-bench/ limits/ Informix. cfg
tests/sql-bench/ limits/ access. cfg
tests/sql-bench/ limits/ access_ odbc.cfg
tests/sql-bench/ limits/ db2.cfg
tests/sql-bench/ limits/ empress. cfg
tests/sql-bench/ limits/ frontbase. cfg
tests/sql-bench/ limits/ interbase- dialect1. cfg
tests/sql-bench/ limits/ interbase- dialect3. cfg
tests/sql-bench/ limits/ interbase- superserver. cfg
tests/sql-bench/ limits/ interbase. cfg
tests/sql-bench/ limits/ mimer.cfg
tests/sql-bench/ limits/ ms-sql. cfg
tests/sql-bench/ limits/ ms-sql65. cfg
tests/sql-bench/ limits/ msql.cfg
tests/sql-bench/ limits/ mysql-3. 22.cfg
tests/sql-bench/ limits/ mysql-3. 23.cfg
tests/sql-bench/ limits/ mysql-4. 0.cfg
tests/sql-bench/ limits/ mysql-4. 1.cfg
tests/sql-bench/ limits/ mysql.cfg
tests/sql-bench/ limits/ oracle. cfg
tests/sql-bench/ limits/ pg.cfg
tests/sql-bench/ limits/ solid-nt4. cfg
tests/sql-bench/ limits/ solid.cfg
tests/sql-bench/ limits/ sybase. cfg
tests/sql-bench/ myisam. cnf
tests/sql-bench/ output/
tests/sql-bench/ pwd.bat
tests/sql-bench/ run-all- tests
tests/sql-bench/ server- cfg
tests/sql-bench/ test-ATIS
tests/sql-bench/ test-alter- table
tests/sql-bench/ test-big- tables
tests/sql-bench/ test-connect
tests/sql-bench/ test-create
tests/sql-bench/ test-insert
tests/sql-bench/ test-select
tests/sql-bench/ test-transactio ns
tests/sql-bench/ test-wisconsin
tests/sql-bench/ uname.bat
tests/sqlbench_ tests/
tests/sqlbench_ tests/main/
tests/sqlbench_ tests/main/ all_sqlbench_ tests.cnf
tests/sysbench_ tests/
tests/sysbench_ tests/readonly/
tests/sysbench_ tests/readonly/ concurrency_ 1024.cnf
tests/sysbench_ tests/readonly/ concurrency_ 128.cnf
tests/sysbench_ tests/readonly/ concurrency_ 16.cnf
tests/sysbench_ tests/readonly/ concurrency_ 256.cnf
tests/sysbench_ tests/readonly/ concurrency_ 32.cnf
tests/sysbench_ tests/readonly/ concurrency_ 512.cnf
tests/sysbench_ tests/readonly/ concurrency_ 64.cnf
tests/sysbench_ tests/readwrite /
tests/sysbench_ tests/readwrite /concurrency_ 1024.cnf
tests/sysbench_ tests/readwrite /concurrency_ 128.cnf
tests/sysbench_ tests/readwrite /concurrency_ 16.cnf
tests/sysbench_ tests/readwrite /concurrency_ 256.cnf
tests/sysbench_ tests/readwrite /concurrency_ 32.cnf
tests/sysbench_ tests/readwrite /concurrency_ 512.cnf
tests/sysbench_ tests/readwrite /concurrency_ 64.cnf
added:
tests/lib/util/ sysbench_ methods. py
tests/qp_tests/ sysbench/
tests/qp_tests/ sysbench/ sysbench_ readonly_ test.py
tests/test_tools/
renamed:
tests/kewpie/ drizzle_ tests/ => tests/qp_tests/
tests/kewpie/ kewpie. py => tests/kewpie.py
tests/kewpie/ lib/modes/ => tests/lib/modes/
tests/kewpie/ lib/opts/ => tests/lib/opts/
tests/kewpie/ lib/server_ mgmt/ => tests/lib/ server_ mgmt/
tests/kewpie/ lib/sys_ mgmt/ => tests/lib/sys_mgmt/
tests/kewpie/ lib/test_ mgmt/ => tests/lib/ test_mgmt/
tests/kewpie/ lib/util/ => tests/lib/util/
tests/kewpie/ qp_data/ => tests/qp_data/
tests/kewpie/ randgen/ => tests/test_ tools/randgen/
tests/kewpie/ sql-bench/ => tests/test_ tools/sql- bench/
modified:
.bzrignore
tests/include.am
tests/lib/modes/ native/ native_ test_management .py
tests/lib/opts/ defaults. py
tests/lib/opts/ test_run_ options. py
tests/lib/test_ mgmt/test_ execution. py
tests/kewpie.py
pending merge tips: (use -v to see all merge revisions)
patrick crews 2012-05-31 Minor cleanup of redundant entry in tests/include.am - 2564. By Patrick Crews
-
Merge denis' main.cc changes
Brian Aker (brianaker) wrote : | # |
Whomever does the next pass can merge the two execution paths.
denis (denisboyun) wrote : | # |
What kind of executions paths you mean? You can show me a simple example that you have in mind? "...though the end game is to create just one signal handle thread." - it mean all function for signal handler situated in plugin/
Brian Aker (brianaker) wrote : | # |
Merge conflict:
RevisionState revno:2564 revid:<email address hidden>
[workspace] $ /bin/sh -xe /tmp/hudson1872
+ bzr merge lp:~denisboyun/drizzle/main_cc_change_part3
M drizzled/main.cc
M drizzled/
M drizzled/
Text conflict in drizzled/main.cc
1 conflicts encountered.
Build step 'Execute shell' marked build as failure
Notifying upstream projects of job completion
Finished: FAILURE
denis (denisboyun) wrote : | # |
denis@denis-
M drizzled/main.cc
M drizzled/
M drizzled/
All changes applied successfully.
All done. all conflicts are resolved...Hingo, thank you very much for you help
Unmerged revisions
Preview Diff
1 | === modified file 'drizzled/main.cc' |
2 | --- drizzled/main.cc 2012-06-04 12:18:56 +0000 |
3 | +++ drizzled/main.cc 2012-06-06 22:24:19 +0000 |
4 | @@ -81,6 +81,7 @@ |
5 | extern bool opt_daemon; |
6 | |
7 | |
8 | + |
9 | /** |
10 | All global error messages are sent here where the first one is stored |
11 | for the client. |
12 | @@ -219,9 +220,14 @@ |
13 | sigprocmask(SIG_UNBLOCK,&set,NULL); |
14 | pthread_sigmask(SIG_UNBLOCK,&set,NULL); |
15 | |
16 | + sa.sa_handler = drizzled_sigint_handler; |
17 | + sigaction(SIGINT,&sa,NULL); |
18 | + |
19 | return; |
20 | } |
21 | |
22 | + |
23 | + |
24 | static void GoogleProtoErrorThrower(google::protobuf::LogLevel level, |
25 | const char* , |
26 | int, const string& ) throw(const char *) |
27 | @@ -291,9 +297,9 @@ |
28 | init signals & alarm |
29 | After this we can't quit by a simple unireg_abort |
30 | */ |
31 | + |
32 | init_signals(); |
33 | |
34 | - |
35 | select_thread= pthread_self(); |
36 | select_thread_in_use=1; |
37 | |
38 | |
39 | === modified file 'drizzled/signal_handler.cc' |
40 | --- drizzled/signal_handler.cc 2011-07-14 22:12:02 +0000 |
41 | +++ drizzled/signal_handler.cc 2012-06-06 22:24:19 +0000 |
42 | @@ -34,7 +34,10 @@ |
43 | #include <drizzled/statistics_variables.h> |
44 | #include <drizzled/system_variables.h> |
45 | |
46 | +#define DRIZZLE_UNIX_SOCKET_PATH "/tmp/mysql.socket" |
47 | + |
48 | using namespace drizzled; |
49 | +namespace fs= boost::filesystem; |
50 | |
51 | static uint32_t killed_threads; |
52 | static bool segfaulted= false; |
53 | @@ -48,6 +51,22 @@ |
54 | extern "C" |
55 | { |
56 | |
57 | +void drizzled_sigint_handler(int sig){ |
58 | + struct sigaction sa; |
59 | + switch(sig){ |
60 | + case SIGINT:{ |
61 | + if (fs::exists(DRIZZLE_UNIX_SOCKET_PATH)) |
62 | + { |
63 | + fs::remove(DRIZZLE_UNIX_SOCKET_PATH); |
64 | + } |
65 | + sa.sa_handler=SIG_DFL; |
66 | + sigaction(SIGINT, &sa, NULL); |
67 | + pthread_kill(pthread_self(),SIGINT); |
68 | + break; |
69 | + } |
70 | + } |
71 | +} |
72 | + |
73 | void drizzled_print_signal_warning(int sig) |
74 | { |
75 | if (global_system_variables.log_warnings) |
76 | |
77 | === modified file 'drizzled/signal_handler.h' |
78 | --- drizzled/signal_handler.h 2011-03-14 05:40:28 +0000 |
79 | +++ drizzled/signal_handler.h 2012-06-06 22:24:19 +0000 |
80 | @@ -28,6 +28,7 @@ |
81 | extern "C" void drizzled_print_signal_warning(int sig); |
82 | extern "C" void drizzled_handle_segfault(int sig); |
83 | extern "C" void drizzled_end_thread_signal(int sig); |
84 | +extern "C" void drizzled_sigint_handler(int sig); |
85 | |
86 | /* |
87 | posix sigaction() based signal handler implementation |
Let me take a look (I am on vacation, so responses are likely to be slow).