#At lp:maria
2738 [email protected] 2009-09-15
More after-merge fixes for merging MySQL 5.1.38 into MariaDB.
modified:
mysql-test/t/mysqldump.test
mysys/my_getopt.c
storage/xtradb/buf/buf0flu.c
per-file messages:
mysql-test/t/mysqldump.test
Make test case work when build directory is not world readable
(this is the case for Buildbot checkouts).
mysys/my_getopt.c
Restore bugfix which was lost in previous merge.
storage/xtradb/buf/buf0flu.c
Fix extranous line caused by bad merge.
=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test 2009-09-07 20:50:10 +0000
+++ b/mysql-test/t/mysqldump.test 2009-09-15 12:53:07 +0000
@@ -1982,6 +1982,9 @@ drop table if exists `load`;
create table `load` (a varchar(255));
--copy_file std_data/words.dat $MYSQLTEST_VARDIR/tmp/load.txt
+# LOAD DATA requires the file to be world-readable. This may not be true
+# automatically, depending on how the build directory was created.
+--chmod 0644 $MYSQLTEST_VARDIR/tmp/load.txt
--exec $MYSQL_IMPORT --ignore test $MYSQLTEST_VARDIR/tmp/load.txt
=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c 2009-09-15 10:46:35 +0000
+++ b/mysys/my_getopt.c 2009-09-15 12:53:07 +0000
@@ -656,8 +656,9 @@ static int setval(const struct my_option
return EXIT_OUT_OF_MEMORY;
break;
case GET_ENUM:
- if (((*(ulong *)result_pos)=
- find_type(argument, opts->typelib, 2) - 1) < 0)
+ pos= find_type(argument, opts->typelib, 2) - 1;
+ (*(ulong *)result_pos)= pos;
+ if (pos < 0)
{
/*
Accept an integer representation of the enumerated item.
=== modified file 'storage/xtradb/buf/buf0flu.c'
--- a/storage/xtradb/buf/buf0flu.c 2009-09-15 10:46:35 +0000
+++ b/storage/xtradb/buf/buf0flu.c 2009-09-15 12:53:07 +0000
@@ -1238,7 +1238,6 @@ buf_flush_LRU_recommendation(void)
+ BUF_FLUSH_EXTRA_MARGIN)
&& (distance < BUF_LRU_FREE_SEARCH_LEN)) {
- mutex_t* block_mutex;
if (!bpage->in_LRU_list) {
/* reatart. but it is very optimistic */
bpage = UT_LIST_GET_LAST(buf_pool->LRU);
_______________________________________________
Mailing list: https://launchpad.net/~maria-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~maria-developers
More help : https://help.launchpad.net/ListHelp
