Browse Source
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/disabled.def: Auto merged sql/handler.cc: Auto merged sql/sql_table.cc: Auto merged storage/myisam/ha_myisam.cc: Auto mergedpull/374/head
26 changed files with 2349 additions and 552 deletions
-
6include/keycache.h
-
2include/my_sys.h
-
15mysql-test/extra/binlog_tests/blackhole.test
-
6mysql-test/lib/mtr_io.pl
-
23mysql-test/mysql-test-run.pl
-
3mysql-test/r/binlog_row_blackhole.result
-
3mysql-test/r/binlog_stm_blackhole.result
-
6mysql-test/r/plugin.result
-
1mysql-test/t/disabled.def
-
1mysql-test/t/plugin-master.opt
-
6mysql-test/t/plugin.test
-
1mysql-test/t/rpl_udf-master.opt
-
1mysql-test/t/rpl_udf-slave.opt
-
1mysql-test/t/udf-master.opt
-
17mysql-test/valgrind.supp
-
2582mysys/mf_keycache.c
-
17mysys/my_seek.c
-
3mysys/my_static.c
-
4sql/handler.cc
-
7sql/sql_table.cc
-
30sql/sql_udf.cc
-
124storage/blackhole/ha_blackhole.cc
-
14storage/blackhole/ha_blackhole.h
-
2storage/myisam/ha_myisam.cc
-
13storage/myisam/mi_check.c
-
13storage/myisam/mi_preload.c
@ -0,0 +1 @@ |
|||
$EXAMPLE_PLUGIN_OPT |
|||
@ -0,0 +1 @@ |
|||
$UDF_EXAMPLE_LIB_OPT |
|||
@ -0,0 +1 @@ |
|||
$UDF_EXAMPLE_LIB_OPT |
|||
@ -0,0 +1 @@ |
|||
$UDF_EXAMPLE_LIB_OPT |
|||
2582
mysys/mf_keycache.c
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
Write
Preview
Loading…
Cancel
Save
Reference in new issue