~drizzle-trunk/drizzle/development
Viewing all changes in revision 1637.5.7.
-
Committer:
Prafulla Tekawade
-
Date:
2010-07-13 16:14:14 UTC
-
mfrom:
(1660 build)
-
mto:
(1662.1.4 rollup)
-
mto:
This revision was merged to the branch mainline in
revision
1664.
-
Revision ID:
prafulla_t@users.sourceforge.net-20100713161414-oa1talo3mn365yix
Merge from trunk
- files added:
-
drizzled/generator
- files removed:
-
plugin/blitzdb/tests/t/blitzdb-alter-master.opt
-
plugin/blitzdb/tests/t/blitzdb-basic-master.opt
-
plugin/blitzdb/tests/t/blitzdb-decimal-master.opt
-
plugin/blitzdb/tests/t/blitzdb-index-master.opt
-
plugin/blitzdb/tests/t/blitzdb-indexes-master.opt
-
plugin/blitzdb/tests/t/blitzdb-join-master.opt
-
plugin/blitzdb/tests/t/blitzdb-range-master.opt
- files renamed:
-
plugin/blitzdb/tests/t/blitzdb-master.opt
=>
plugin/blitzdb/tests/t/master.opt
-
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_additional_mem_pool_size_default.result
=>
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_addtl_mem_pool_size_default.result
-
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_default-master.opt
=>
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_addtl_mem_pool_size_default-master.opt
-
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_default.test
=>
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_addtl_mem_pool_size_default.test
-
tests/r/mysqldump-max.result
=>
tests/r/drizzledump-max.result
-
tests/t/mysqldump-max.test
=>
tests/t/drizzledump-max.test
expand all
collapse all
Show diffs side-by-side
added
removed