From 70e677bd0ff75789c659f35f8b03e16006540fc4 Mon Sep 17 00:00:00 2001 From: "sergefp@mysql.com" <> Date: Thu, 31 Mar 2005 20:23:10 +0400 Subject: [PATCH 1/5] Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT --- mysql-test/r/group_by.result | 2 +- mysql-test/t/group_by.test | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index e4904bb7a04..a8766907fa5 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -693,7 +693,7 @@ concat('val-', x3.a + 3*x4.a), -- 12 concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120 concat('val-', @a + 120*D.a) from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4; -delete from t2 where a = 2 and b = 'val-2' limit 30; +delete from t2 where a = 2 and b = 'val-2' order by a,b,c,d limit 30; explain select c from t2 where a = 2 and b = 'val-2' group by c; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref PRIMARY,a PRIMARY 400 const,const 6 Using where diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test index 327be1b724b..46e58cd00fd 100644 --- a/mysql-test/t/group_by.test +++ b/mysql-test/t/group_by.test @@ -508,7 +508,8 @@ insert into t2 select concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120 concat('val-', @a + 120*D.a) from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4; -delete from t2 where a = 2 and b = 'val-2' limit 30; + +delete from t2 where a = 2 and b = 'val-2' order by a,b,c,d limit 30; explain select c from t2 where a = 2 and b = 'val-2' group by c; select c from t2 where a = 2 and b = 'val-2' group by c; From b5e57be56b4942a474e09419e094a0bf00a2345b Mon Sep 17 00:00:00 2001 From: "mskold@mysql.com" <> Date: Thu, 31 Mar 2005 19:18:50 +0200 Subject: [PATCH 2/5] Fixed so no merge conflict with 5.0 --- ndb/src/kernel/blocks/dbdict/Dbdict.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp index 0b8e1910850..7247b7e2b9c 100644 --- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp +++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp @@ -2227,8 +2227,9 @@ void Dbdict::checkSchemaStatus(Signal* signal) restartCreateTab(signal, tableId, oldEntry, false); return; }//if - break; } + ndbrequire(ok); + break; } case SchemaFile::DROP_TABLE_STARTED: jam(); From 94ede0717af1ad69e0cc0fbe2748795d053282be Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Thu, 31 Mar 2005 20:27:29 +0200 Subject: [PATCH 3/5] include sql/examples in the window source distribution --- scripts/make_win_src_distribution.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 036ed6fcc93..a003e52196e 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -251,7 +251,7 @@ copy_dir_dirs() { for i in client dbug extra heap include isam \ libmysql libmysqld merge myisam \ - myisammrg mysys regex sql strings sql-common \ + myisammrg mysys regex sql strings sql-common sql/examples \ tools vio zlib do copy_dir_files $i From 7ace3f136264fbc7de3e50e047ad5f88653c6c3c Mon Sep 17 00:00:00 2001 From: "sergefp@mysql.com" <> Date: Fri, 1 Apr 2005 11:05:17 +0400 Subject: [PATCH 4/5] Better comment --- sql/sql_select.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 57b09fa40b4..3c66574231d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7179,8 +7179,9 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit, /* We'll use ref access method on key new_ref_key. In general case the index search tuple for new_ref_key will be different (e.g. - when one of the indexes only covers prefix of the field, see - BUG#9213 in group_by.test). + when one index is defined as (part1, part2, ...) and another as + (part1, part2(N), ...) and the WHERE clause contains + "part1 = const1 AND part2=const2". So we build tab->ref from scratch here. */ KEYUSE *keyuse= tab->keyuse; From fe5384dad8f88c28baece9bb8602d79734e28a02 Mon Sep 17 00:00:00 2001 From: "msvensson@neptunus.(none)" <> Date: Fri, 1 Apr 2005 12:32:47 +0200 Subject: [PATCH 5/5] BUG#6554 Problem Building MySql on Fedora Core 3 - Remove the local static var --- BitKeeper/etc/logging_ok | 1 + sql/ha_berkeley.cc | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index bf0dfb9e31d..3495e7378b1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -102,6 +102,7 @@ monty@tik. monty@tik.mysql.fi monty@tramp.mysql.fi monty@work.mysql.com +msvensson@neptunus.(none) mwagner@cash.mwagner.org mwagner@evoq.mwagner.org mwagner@here.mwagner.org diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index b307b3a4b75..e820fd023e6 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -336,8 +336,10 @@ void berkeley_cleanup_log_files(void) ** Berkeley DB tables *****************************************************************************/ +static const char *bdb_bas_exts[]= { ha_berkeley_ext, NullS }; const char **ha_berkeley::bas_ext() const -{ static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; } +{ return bdb_bas_exts; } + static int