MariaDB

Code review comment for lp:~paul-mccullagh/maria/maria-pbxt-rc2

  1. maria-pbxt-rc2
  2. Merge into 5.1-converting
Revision history for this message
Kristian Nielsen (knielsen) wrote :

Paul McCullagh <email address hidden> writes:

>> mysqltest: At line 3: query 'alter table t1 rename mysqltest.t1'
>> failed: 1025: Error on rename of './test/t1' to './mysqltest/
>> t1' (errno: 16)
>
>
> Occurs because the PBMS code is compiled in.
>
> This can be disabled by commenting out:
>
> #define PBMS_ENABLED
>
> in xt_defs.h

[xt_config.h actually]

> This is, in fact, a bug in PBMS. I have already reported the bug here: https://bugs.launchpad.net/pbms/+bug/416969
>
> So, if the PBMS_ENABLED code is disable (which should probably be the
> default at the moment), then that test should run through.

Ok, thanks, that solved 3 of the 4 remaining failures.

And the last one is just a missing result file update for test
pbxt.ps_1general. You have this diff in the last commit for ha_pbxt.cc:

- stats.data_file_length = ot->ot_table->tab_rec_eof_id;
+ stats.data_file_length = xt_rec_id_to_rec_offset(ot->ot_table, ot->ot_table->tab_rec_eof_id);

So the data file length output of show table status was fixed from units of
records to units of bytes. I just updated the result file accordingly, from 1
to 1024.

> The other problems seem to have to do with case-sensitivity. I will
> see if I can repeat those errors on one of my machines.

Yes, they are case sensitivity issues (except udf maybe). As I said, they all
pass with the patch I gave, which just adds missing *-master.opt files that
are in the main test suite, but where not copied into the pbxt suite along
with the *.test files.

So I will merge this into MariaDB with attached patch to disable PBMS and fix
test failures.

I really want to also enable the PBXT test suite in our
Buildbot. Unfortunately I am really pressed for time do do this now. For one,
I see a number of Valgrind errors when running the suite that I need to
investigate. But one of these days,

Thanks,

 - Kristian.

1
1=== modified file 'mysql-test/suite/pbxt/r/lowercase_view.result'
2--- mysql-test/suite/pbxt/r/lowercase_view.result 2009-04-02 20:36:52 +0000
3+++ mysql-test/suite/pbxt/r/lowercase_view.result 2009-08-31 11:07:44 +0000
4@@ -119,7 +119,7 @@ create table t1Aa (col1 int);
5 create view v1Aa as select col1 from t1Aa as AaA;
6 show create view v1AA;
7 View Create View character_set_client collation_connection
8-v1aa CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `AaA`.`col1` AS `col1` from `t1aa` `AaA` latin1 latin1_swedish_ci
9+v1aa CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `aaa` latin1 latin1_swedish_ci
10 drop view v1AA;
11 select Aaa.col1 from t1Aa as AaA;
12 col1
13@@ -128,7 +128,7 @@ drop view v1AA;
14 create view v1Aa as select AaA.col1 from t1Aa as AaA;
15 show create view v1AA;
16 View Create View character_set_client collation_connection
17-v1aa CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `AaA`.`col1` AS `col1` from `t1aa` `AaA` latin1 latin1_swedish_ci
18+v1aa CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `aaa` latin1 latin1_swedish_ci
19 drop view v1AA;
20 drop table t1Aa;
21 CREATE TABLE t1 (a int, b int);
22@@ -142,7 +142,7 @@ CREATE OR REPLACE VIEW v1 AS
23 select X.a from t1 AS X group by X.b having (X.a = 1);
24 SHOW CREATE VIEW v1;
25 View Create View character_set_client collation_connection
26-v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `X`.`a` AS `a` from `t1` `X` group by `X`.`b` having (`X`.`a` = 1) latin1 latin1_swedish_ci
27+v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `x`.`a` AS `a` from `t1` `x` group by `x`.`b` having (`x`.`a` = 1) latin1 latin1_swedish_ci
28 SELECT * FROM v1;
29 a
30 DROP VIEW v1;
31
32=== modified file 'mysql-test/suite/pbxt/r/ps_1general.result'
33--- mysql-test/suite/pbxt/r/ps_1general.result 2009-08-17 15:57:58 +0000
34+++ mysql-test/suite/pbxt/r/ps_1general.result 2009-08-31 11:07:44 +0000
35@@ -293,7 +293,7 @@ t2 1 t2_idx 1 b A 0 NULL NULL YES BTREE
36 prepare stmt4 from ' show table status from test like ''t2%'' ';
37 execute stmt4;
38 Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
39-t2 PBXT 10 Fixed 0 29 1 # 4096 0 NULL # # # latin1_swedish_ci NULL
40+t2 PBXT 10 Fixed 0 29 1024 # 4096 0 NULL # # # latin1_swedish_ci NULL
41 prepare stmt4 from ' show table status from test like ''t9%'' ';
42 execute stmt4;
43 Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
44
45=== added file 'mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt'
46--- mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt 1970-01-01 00:00:00 +0000
47+++ mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt 2009-08-31 11:07:44 +0000
48@@ -0,0 +1 @@
49+--lower_case_table_names
50
51=== added file 'mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt'
52--- mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt 1970-01-01 00:00:00 +0000
53+++ mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt 2009-08-31 11:07:44 +0000
54@@ -0,0 +1 @@
55+--lower_case_table_names
56
57=== added file 'mysql-test/suite/pbxt/t/lowercase_view-master.opt'
58--- mysql-test/suite/pbxt/t/lowercase_view-master.opt 1970-01-01 00:00:00 +0000
59+++ mysql-test/suite/pbxt/t/lowercase_view-master.opt 2009-08-31 11:07:44 +0000
60@@ -0,0 +1 @@
61+--lower_case_table_names=1
62
63=== added file 'mysql-test/suite/pbxt/t/udf-master.opt'
64--- mysql-test/suite/pbxt/t/udf-master.opt 1970-01-01 00:00:00 +0000
65+++ mysql-test/suite/pbxt/t/udf-master.opt 2009-08-31 11:07:44 +0000
66@@ -0,0 +1 @@
67+$UDF_EXAMPLE_LIB_OPT
68
69=== modified file 'storage/pbxt/src/Makefile.am'
70--- storage/pbxt/src/Makefile.am 2009-05-09 04:01:53 +0000
71+++ storage/pbxt/src/Makefile.am 2009-08-31 11:07:44 +0000
72@@ -19,7 +19,7 @@ noinst_HEADERS = bsearch_xt.h cache_xt.
73 datadic_xt.h datalog_xt.h filesys_xt.h hashtab_xt.h \
74 ha_pbxt.h heap_xt.h index_xt.h linklist_xt.h \
75 memory_xt.h myxt_xt.h pthread_xt.h restart_xt.h \
76- streaming_xt.h sortedlist_xt.h strutil_xt.h \
77+ pbms_enabled.h sortedlist_xt.h strutil_xt.h \
78 tabcache_xt.h table_xt.h trace_xt.h thread_xt.h \
79 util_xt.h xaction_xt.h xactlog_xt.h lock_xt.h \
80 systab_xt.h ha_xtsys.h discover_xt.h \
81@@ -30,7 +30,7 @@ libpbxt_la_SOURCES = bsearch_xt.cc cache
82 datadic_xt.cc datalog_xt.cc filesys_xt.cc hashtab_xt.cc \
83 ha_pbxt.cc heap_xt.cc index_xt.cc linklist_xt.cc \
84 memory_xt.cc myxt_xt.cc pthread_xt.cc restart_xt.cc \
85- streaming_xt.cc sortedlist_xt.cc strutil_xt.cc \
86+ pbms_enabled.cc sortedlist_xt.cc strutil_xt.cc \
87 tabcache_xt.cc table_xt.cc trace_xt.cc thread_xt.cc \
88 systab_xt.cc ha_xtsys.cc discover_xt.cc \
89 util_xt.cc xaction_xt.cc xactlog_xt.cc lock_xt.cc locklist_xt.cc
90
91=== modified file 'storage/pbxt/src/xt_config.h'
92--- storage/pbxt/src/xt_config.h 2009-08-18 07:46:53 +0000
93+++ storage/pbxt/src/xt_config.h 2009-08-31 11:07:44 +0000
94@@ -81,7 +81,8 @@ const int max_connections = 500;
95 #define DEBUG
96 #endif // _DEBUG
97 #else
98-#define PBMS_ENABLED
99+// Paul suggested to disable PBMS in MariaDB for now.
100+// #define PBMS_ENABLED
101 #endif
102
103 #ifdef __FreeBSD__

« Back to merge proposal