[Maria-developers] Rev 2720: Fix for in file:///Users/hakan/work/monty_program/maria/

2009-08-31 Thread Hakan Kuecuekyilmaz
At file:///Users/hakan/work/monty_program/maria/


revno: 2720
revision-id: ha...@askmonty.org-20090831214839-gsh1r8mnkrdyzc38
parent: kniel...@knielsen-hq.org-20090805072137-wg97dcem1cxnzt3p
committer: Hakan Kuecuekyilmaz 
branch nick: maria
timestamp: Mon 2009-08-31 23:48:39 +0200
message:
  Fix for
  mysqlslap: setting --engine does not get replicated
  http://bugs.mysql.com/bug.php?id=46967
  
  Problem was that a "set storage_engine = "
  is not replicated.
  
  Fixed by adding an explicit
  Engine = 
  
  to the build_table_string() function.
  
  Open question:
Should MySQL's replication actually replicate the
set storage_engine command or not?
=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c2009-04-25 10:05:32 +
+++ b/client/mysqlslap.c2009-08-31 21:48:39 +
@@ -880,6 +880,12 @@
 }
 
   dynstr_append(&table_string, ")");
+  
+  if (default_engine) {
+dynstr_append(&table_string, " Engine = ");
+dynstr_append(&table_string, default_engine);
+  }
+
   ptr= (statement *)my_malloc(sizeof(statement), 
   MYF(MY_ZEROFILL|MY_FAE|MY_WME));
   ptr->string = (char *)my_malloc(table_string.length+1,

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp


[Maria-developers] Rev 2720: Fix for in file:///Users/hakan/work/monty_program/maria/

2009-08-31 Thread Hakan Kuecuekyilmaz
At file:///Users/hakan/work/monty_program/maria/


revno: 2720
revision-id: ha...@askmonty.org-20090831212214-wg9fwhgnhx1ly6w2
parent: kniel...@knielsen-hq.org-20090805072137-wg97dcem1cxnzt3p
committer: Hakan Kuecuekyilmaz 
branch nick: maria
timestamp: Mon 2009-08-31 23:22:14 +0200
message:
  Fix for
  mysqlslap: setting --engine does not get replicated
  http://bugs.mysql.com/bug.php?id=46967
  
  Problem was that a "set storage_engine = "
  is not replicated.
  
  Fixed by adding an explicit
  Engine = 
  
  to the build_table_string() function.
  
  Open question:
Should MySQL's replication actually replicate the
set storage_engine command or not?
=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c2009-04-25 10:05:32 +
+++ b/client/mysqlslap.c2009-08-31 21:22:14 +
@@ -880,6 +880,12 @@
 }
 
   dynstr_append(&table_string, ")");
+  
+  if (default_engine) {
+dynstr_append(&table_string, " Engine = ");
+dynstr_append(&table_string, default_engine);
+  }
+
   ptr= (statement *)my_malloc(sizeof(statement), 
   MYF(MY_ZEROFILL|MY_FAE|MY_WME));
   ptr->string = (char *)my_malloc(table_string.length+1,

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp


[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2722: Merge Paul's maria-pbxt-rc2 branch into MariaDB.

2009-08-31 Thread noreply
Merge authors:
  Kristian Nielsen (knielsen)
  Paul McCullagh (paul-mccullagh)
Related merge proposals:
  https://code.launchpad.net/~paul-mccullagh/maria/maria-pbxt-rc2/+merge/10303
  proposed by: Paul McCullagh (paul-mccullagh)

revno: 2722 [merge]
committer: kniel...@knielsen-hq.org
branch nick: work
timestamp: Mon 2009-08-31 13:23:39 +0200
message:
  Merge Paul's maria-pbxt-rc2 branch into MariaDB.
  
  Includes disabling PBMS (per Paul's recommendation) and test file fixes.
  
  Signed-off-by: Kristian Nielsen 
removed:
  storage/pbxt/src/streaming_xt.cc
  storage/pbxt/src/streaming_xt.h
added:
  mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt
  mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt
  mysql-test/suite/pbxt/t/lowercase_view-master.opt
  mysql-test/suite/pbxt/t/udf-master.opt
  storage/pbxt/src/pbms_enabled.cc
  storage/pbxt/src/pbms_enabled.h
modified:
  mysql-test/suite/pbxt/r/alter_table.result
  mysql-test/suite/pbxt/r/analyze.result
  mysql-test/suite/pbxt/r/auto_increment.result
  mysql-test/suite/pbxt/r/delete.result
  mysql-test/suite/pbxt/r/distinct.result
  mysql-test/suite/pbxt/r/func_group.result
  mysql-test/suite/pbxt/r/func_math.result
  mysql-test/suite/pbxt/r/func_str.result
  mysql-test/suite/pbxt/r/grant.result
  mysql-test/suite/pbxt/r/group_min_max.result
  mysql-test/suite/pbxt/r/join.result
  mysql-test/suite/pbxt/r/join_nested.result
  mysql-test/suite/pbxt/r/key.result
  mysql-test/suite/pbxt/r/key_cache.result
  mysql-test/suite/pbxt/r/key_diff.result
  mysql-test/suite/pbxt/r/lowercase_view.result
  mysql-test/suite/pbxt/r/mysqlshow.result
  mysql-test/suite/pbxt/r/null.result
  mysql-test/suite/pbxt/r/null_key.result
  mysql-test/suite/pbxt/r/partition_pruning.result
  mysql-test/suite/pbxt/r/pbxt_bugs.result
  mysql-test/suite/pbxt/r/pbxt_ref_int.result
  mysql-test/suite/pbxt/r/preload.result
  mysql-test/suite/pbxt/r/ps_1general.result
  mysql-test/suite/pbxt/r/range.result
  mysql-test/suite/pbxt/r/schema.result
  mysql-test/suite/pbxt/r/select.result
  mysql-test/suite/pbxt/r/select_safe.result
  mysql-test/suite/pbxt/r/subselect.result
  mysql-test/suite/pbxt/r/type_enum.result
  mysql-test/suite/pbxt/r/type_ranges.result
  mysql-test/suite/pbxt/r/type_timestamp.result
  mysql-test/suite/pbxt/r/union.result
  mysql-test/suite/pbxt/r/view_grant.result
  mysql-test/suite/pbxt/t/auto_increment.test
  mysql-test/suite/pbxt/t/delete.test
  mysql-test/suite/pbxt/t/join_nested.test
  mysql-test/suite/pbxt/t/null.test
  mysql-test/suite/pbxt/t/pbxt_bugs.test
  mysql-test/suite/pbxt/t/rename.test
  mysql-test/suite/pbxt/t/schema.test
  mysql-test/suite/pbxt/t/type_enum.test
  mysql-test/suite/pbxt/t/union.test
  storage/pbxt/ChangeLog
  storage/pbxt/src/Makefile.am
  storage/pbxt/src/cache_xt.cc
  storage/pbxt/src/cache_xt.h
  storage/pbxt/src/ccutils_xt.cc
  storage/pbxt/src/database_xt.cc
  storage/pbxt/src/datadic_xt.cc
  storage/pbxt/src/datadic_xt.h
  storage/pbxt/src/datalog_xt.cc
  storage/pbxt/src/datalog_xt.h
  storage/pbxt/src/discover_xt.cc
  storage/pbxt/src/filesys_xt.cc
  storage/pbxt/src/filesys_xt.h
  storage/pbxt/src/ha_pbxt.cc
  storage/pbxt/src/ha_pbxt.h
  storage/pbxt/src/ha_xtsys.cc
  storage/pbxt/src/ha_xtsys.h
  storage/pbxt/src/hashtab_xt.cc
  storage/pbxt/src/heap_xt.cc
  storage/pbxt/src/heap_xt.h
  storage/pbxt/src/index_xt.cc
  storage/pbxt/src/index_xt.h
  storage/pbxt/src/lock_xt.cc
  storage/pbxt/src/lock_xt.h
  storage/pbxt/src/locklist_xt.cc
  storage/pbxt/src/locklist_xt.h
  storage/pbxt/src/memory_xt.cc
  storage/pbxt/src/memory_xt.h
  storage/pbxt/src/myxt_xt.cc
  storage/pbxt/src/myxt_xt.h
  storage/pbxt/src/pbms.h
  storage/pbxt/src/pthread_xt.cc
  storage/pbxt/src/restart_xt.cc
  storage/pbxt/src/restart_xt.h
  storage/pbxt/src/sortedlist_xt.cc
  storage/pbxt/src/strutil_xt.cc
  storage/pbxt/src/systab_xt.cc
  storage/pbxt/src/systab_xt.h
  storage/pbxt/src/tabcache_xt.cc
  storage/pbxt/src/tabcache_xt.h
  storage/pbxt/src/table_xt.cc
  storage/pbxt/src/table_xt.h
  storage/pbxt/src/thread_xt.cc
  storage/pbxt/src/thread_xt.h
  storage/pbxt/src/trace_xt.cc
  storage/pbxt/src/trace_xt.h
  storage/pbxt/src/util_xt.cc
  storage/pbxt/src/xaction_xt.cc
  storage/pbxt/src/xaction_xt.h
  storage/pbxt/src/xactlog_xt.cc
  storage/pbxt/src/xactlog_xt.h
  storage/pbxt/src/xt_config.h
  storage/pbxt/src/xt_defs.h
The size of the diff (15366 lines) is larger than your specified limit of 1000 
lines

--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to 
https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.l

[Maria-developers] Rev 2749: MWL#17: Table-elimination in file:///home/psergey/dev/maria-5.1-table-elim-r11/

2009-08-31 Thread Sergey Petrunya
At file:///home/psergey/dev/maria-5.1-table-elim-r11/


revno: 2749
revision-id: pser...@askmonty.org-20090831200209-7gbnkr7omjbgld1x
parent: pser...@askmonty.org-20090826210140-y2pba3ucdwnvr956
committer: Sergey Petrunya 
branch nick: maria-5.1-table-elim-r11
timestamp: Tue 2009-09-01 00:02:09 +0400
message:
  MWL#17: Table-elimination
  - Addressing review feedback, generation 4.

Diff too large for email (2658 lines, the limit is 1000).

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp


Re: [Maria-developers] MariaDB versioning

2009-08-31 Thread Peter Laursen
We do not specifically strive to support (the outdated and irrelevant) MySQL
5.2 of course.  But we cannot prevent anyone from connecting to it with
SQLyog. In that case SQLyog (any client) will have to assume that 5.2/6.0
functionalities are available (LOAD DATA XML, server side BACKUP/RESTORE ..
to the extend that MySQL 6.0 features we implemented already - I did not
check details).
.
Basically we do not support *specific* version. We work with any server the
the compiled-in client (libmysql) can communitate with.  If there is no
server error or client error we simply open the program - porvided that we
*can*.  But acutally if there is uncertainity aboyt the meaning of the
version string returned by by the server we may not even be able to paint
the GUI (examples: 1) if we cannot identify clearly if version <5.1.0 we
will not know if a database object can contain an EVENTS folder 2) what
options should be in various menus depends on what server supports)
.
Also SQLyog is capable of connecting to an unlimited number of (different)
servers simultaneously and will be able to copy and sync structure and data
from one to another.  For lots of those functionalities we will need to know
details about server (fo isntance becasue code contains wrokaround for quite
a lot of server bugs).
.
I do not claim that 5.2 mismatch is very important (MySQL 5.2 is dead).  We
will be able to work around ithis timet. I was more concerned about
versioning going wildly different from MySQL in the future. So a very clear
version string is requested so that we can code in 'knowledge about versions
to the extent that SHOW and SELECT FROM I_S does not reveal information). It
could be '5..1.88*MDB*_something ..'
.
btw: (I have critized Drizzle during UC for lack of discipline in
versioning!)

On Mon, Aug 31, 2009 at 12:06, Henrik Ingo wrote:

> Hi Peter...
>
> On Sun, Aug 30, 2009 at 5:47 PM, Peter Laursen
> wrote:
> > I have a concern that I will ask you all to consider while there is
> > time.  I think I understand that after MariaDB 5.1 a 5.2 release is
> > planned.  I think it should not be versioned like that.  Problem is that
> > there is a MySQL 5.2 tree too (it is basically an early 6.0) and it is
> > still available for download from FTP-mirrors like
> > ftp://mirrors.dotsrc.org/mysql/Downloads/ .
>
> And at Webyog you strive to actually support that version?
>
> > For generic and GUI clients (ie. not designed for specific server
> > versions and where SQL is generated and not written by user) it is
> > important that the version string can be used to identify what SQL
> > statements are supported by server. The first thing such clients (like
> > our own SQLyog) does after connection is to SELECT VERSION() .. and only
> > after that we know if there is support for EVENTS, if IF EXISTS is
> > supported for DROP TRIGGER sysntax and so on.  If there are two
> > different 5.2 trees (MariaDB based on MySQL 5.1 and MySQL 5.2) it gets
> > more difficult to handle.
> > .
> > I asked Monty about this at one of his sessions at the latest UC and he
> > told like 'we are good citizens - except for the comment field MariaDB
> > will be versioned like the MySQL code it is based upon'. What I also
> > think is the best solution. The *version* should not be the same for
> > different builds with even the slightest difference in what SQL server
> > understands. On the opposite version should be the same as long as SQL-
> > interface (even with possible Engine-specific extensions) is the same no
> > matter how much they differ internally.
> >
> > Maybe in the long run diversification is inevitable.  But in that case
> > it should be planned well!
>
> From your point of view, how should we identify a release that
>
> - Uses MySQL 5.1 as baseline
> - Note: MariaDB 5.1 also uses MySQL 5.1 as baseline
> - Has more features than MariaDB 5.1
>
> ?
>
> henrik
>
> --
> email: henrik.i...@avoinelama.fi
> tel:   +358-40-5697354
> www:   www.avoinelama.fi/~hingo
> book:  www.openlife.cc
>
___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp


Re: [Maria-developers] [Merge] lp:~paul-mccullagh/maria/maria-pbxt-rc2 into lp:maria

2009-08-31 Thread Greg Stark
I'm not too familiar with launchpad so I'm a bit puzzled how you
generated this email. The headers are really messed up.

1) It has a bogus reply-to header (but this seems to be standard
launchpad bogosity)
2) The mailing list doesn't appear in the To or Cc headers (ie, it's "bcc"ed)
3) There is no List-Id or other headers to indicate what list it was sent to
4) The envelope sender is a generic "boun...@canonical.com"

Basically it resists any attempt to filter it intelligently or to
conform to any sane mailing list practices. If this is a symptom of
launchpad design could it be addressed?

-- 
greg
http://mit.edu/~gsstark/resume.pdf
https://code.launchpad.net/~paul-mccullagh/maria/maria-pbxt-rc2/+merge/10303
Your team Maria developers is subscribed to branch lp:maria.

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp


Re: [Maria-developers] MariaDB versioning

2009-08-31 Thread Kristian Nielsen
Peter Laursen  writes:

> I have a concern that I will ask you all to consider while there is
> time.  I think I understand that after MariaDB 5.1 a 5.2 release is
> planned.  I think it should not be versioned like that.  Problem is that
> there is a MySQL 5.2 tree too (it is basically an early 6.0) and it is
> still available for download from FTP-mirrors like
> ftp://mirrors.dotsrc.org/mysql/Downloads/ .
> .
> For generic and GUI clients (ie. not designed for specific server
> versions and where SQL is generated and not written by user) it is
> important that the version string can be used to identify what SQL
> statements are supported by server. The first thing such clients (like
> our own SQLyog) does after connection is to SELECT VERSION() .. and only
> after that we know if there is support for EVENTS, if IF EXISTS is
> supported for DROP TRIGGER sysntax and so on.  If there are two
> different 5.2 trees (MariaDB based on MySQL 5.1 and MySQL 5.2) it gets
> more difficult to handle.

Thanks for taking up this issue.

I agree of course with your concerns about versioning.

The problem is that numbers are linear, but source code branches/forks form a
tree.

So if we want to release a separate branch of MariaDB which has more features
than the MariaDB-5.1 branch, but less than MySQL 5.2/5.4/6.0. How will we name
that version? We were thinking to use 5.2 as that version was never properly
released. But what would be a better option?

Of course, MySQL already broke this somewhat, as 5.4 is based on 5.1 with some
patches (AFAIK), so might concievably be missing some features that are in
5.2.

And I have also understood that MySQL has now likewise abandoned the 5.4
version just like the 6.0 version.

Suggestions welcome, we will need to think carefully about this and follow
events to choose the correct path forward. Or failing that at least the one
that is the least broken.

 - Kristian.

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp


Re: [Maria-developers] [Merge] lp:~paul-mccullagh/maria/maria-pbxt-rc2 into lp:maria

2009-08-31 Thread Kristian Nielsen
Paul McCullagh  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.


-- 
https://code.launchpad.net/~paul-mccullagh/maria/maria-pbxt-rc2/+merge/10303
Your team Maria developers is subscribed to branch lp:maria.=== modified file 'mysql-test/suite/pbxt/r/lowercase_view.result'
--- mysql-test/suite/pbxt/r/lowercase_view.result	2009-04-02 20:36:52 +
+++ mysql-test/suite/pbxt/r/lowercase_view.result	2009-08-31 11:07:44 +
@@ -119,7 +119,7 @@ create table t1Aa (col1 int);
 create view v1Aa as select col1 from t1Aa as AaA;
 show create view v1AA;
 View	Create View	character_set_client	collation_connection
-v1aa	CREATE ALGORITHM=UNDEFINED definer=`ro...@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `AaA`.`col1` AS `col1` from `t1aa` `AaA`	latin1	latin1_swedish_ci
+v1aa	CREATE ALGORITHM=UNDEFINED definer=`ro...@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `aaa`	latin1	latin1_swedish_ci
 drop view v1AA;
 select Aaa.col1 from t1Aa as AaA;
 col1
@@ -128,7 +128,7 @@ drop view v1AA;
 create view v1Aa as select AaA.col1 from t1Aa as AaA;
 show create view v1AA;
 View	Create View	character_set_client	collation_connection
-v1aa	CREATE ALGORITHM=UNDEFINED definer=`ro...@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `AaA`.`col1` AS `col1` from `t1aa` `AaA`	latin1	latin1_swedish_ci
+v1aa	CREATE ALGORITHM=UNDEFINED definer=`ro...@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `aaa`	latin1	latin1_swedish_ci
 drop view v1AA;
 drop table t1Aa;
 CREATE TABLE  t1 (a int, b int);
@@ -142,7 +142,7 @@ CREATE OR REPLACE VIEW v1 AS
 select X.a from t1 AS X group by X.b having (X.a = 1);
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED definer=`ro...@`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
+v1	CREATE ALGORITHM=UNDEFINED definer=`ro...@`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
 SELECT * FROM v1;
 a
 DROP VIEW v1;

=== modified file 'mysql-test/suite/pbxt/r/ps_1general.result'
--- mysql-test/suite/pbxt/r/ps_1general.result	2009-08-17 15:57:58 +
+++ mysql-test/suite/pbxt/r/ps_1general.result	2009-08-31 11:07:44 +
@@ -293,7 +293,7 @@ t2	1	t2_idx	1	b	A	0	NULL	NULL	YES	BTREE	
 prepare stmt4 from ' show table status from test like ''t2%'' ';
 execute stmt4;
 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
-t2	PBXT	10	Fixed	0	29	1	#	4096	0	NULL	#	#	#	latin1_swedish_ci	NULL		
+t2	PBXT	10	Fixed	0	29	1024	#	4096	0	NULL	#	#	#	latin1_swedish_ci	NULL		
 prepare stmt4 from ' show table status from test like ''t9%'' ';
 execute stmt4;
 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

==

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2723)

2009-08-31 Thread knielsen
#At lp:maria

 2723 kniel...@knielsen-hq.org  2009-08-31
  PBXT merge fixes.
  
   - Disable PBMS in MariaDB (as per recommendation of Paul).
   - Add missing *-master.opt files to make testsuite work on 
case-sensitive file systems.
   - Result file updates.
  added:
mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt
mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt
mysql-test/suite/pbxt/t/lowercase_view-master.opt
mysql-test/suite/pbxt/t/udf-master.opt
  modified:
mysql-test/suite/pbxt/r/lowercase_view.result
mysql-test/suite/pbxt/r/ps_1general.result
storage/pbxt/src/Makefile.am
storage/pbxt/src/xt_config.h

=== modified file 'mysql-test/suite/pbxt/r/lowercase_view.result'
--- a/mysql-test/suite/pbxt/r/lowercase_view.result 2009-04-02 20:36:52 
+
+++ b/mysql-test/suite/pbxt/r/lowercase_view.result 2009-08-31 11:07:44 
+
@@ -119,7 +119,7 @@ create table t1Aa (col1 int);
 create view v1Aa as select col1 from t1Aa as AaA;
 show create view v1AA;
 View   Create View character_set_clientcollation_connection
-v1aa   CREATE ALGORITHM=UNDEFINED definer=`ro...@`localhost` SQL SECURITY 
DEFINER VIEW `v1aa` AS select `AaA`.`col1` AS `col1` from `t1aa` `AaA`   
latin1  latin1_swedish_ci
+v1aa   CREATE ALGORITHM=UNDEFINED definer=`ro...@`localhost` SQL SECURITY 
DEFINER VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `aaa`   
latin1  latin1_swedish_ci
 drop view v1AA;
 select Aaa.col1 from t1Aa as AaA;
 col1
@@ -128,7 +128,7 @@ drop view v1AA;
 create view v1Aa as select AaA.col1 from t1Aa as AaA;
 show create view v1AA;
 View   Create View character_set_clientcollation_connection
-v1aa   CREATE ALGORITHM=UNDEFINED definer=`ro...@`localhost` SQL SECURITY 
DEFINER VIEW `v1aa` AS select `AaA`.`col1` AS `col1` from `t1aa` `AaA`   
latin1  latin1_swedish_ci
+v1aa   CREATE ALGORITHM=UNDEFINED definer=`ro...@`localhost` SQL SECURITY 
DEFINER VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `aaa`   
latin1  latin1_swedish_ci
 drop view v1AA;
 drop table t1Aa;
 CREATE TABLE  t1 (a int, b int);
@@ -142,7 +142,7 @@ CREATE OR REPLACE VIEW v1 AS
 select X.a from t1 AS X group by X.b having (X.a = 1);
 SHOW CREATE VIEW v1;
 View   Create View character_set_clientcollation_connection
-v1 CREATE ALGORITHM=UNDEFINED definer=`ro...@`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
+v1 CREATE ALGORITHM=UNDEFINED definer=`ro...@`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
 SELECT * FROM v1;
 a
 DROP VIEW v1;

=== modified file 'mysql-test/suite/pbxt/r/ps_1general.result'
--- a/mysql-test/suite/pbxt/r/ps_1general.result2009-08-17 15:57:58 
+
+++ b/mysql-test/suite/pbxt/r/ps_1general.result2009-08-31 11:07:44 
+
@@ -293,7 +293,7 @@ t2  1   t2_idx  1   b   A   0   NULL
NULLYES BTREE   
 prepare stmt4 from ' show table status from test like ''t2%'' ';
 execute stmt4;
 Name   Engine  Version Row_format  RowsAvg_row_length  Data_length 
Max_data_length Index_lengthData_free   Auto_increment  Create_time 
Update_time Check_time  Collation   ChecksumCreate_options  
Comment
-t2 PBXT10  Fixed   0   29  1   #   40960   
NULL#   #   #   latin1_swedish_ci   NULL
+t2 PBXT10  Fixed   0   29  1024#   40960   
NULL#   #   #   latin1_swedish_ci   NULL
 prepare stmt4 from ' show table status from test like ''t9%'' ';
 execute stmt4;
 Name   Engine  Version Row_format  RowsAvg_row_length  Data_length 
Max_data_length Index_lengthData_free   Auto_increment  Create_time 
Update_time Check_time  Collation   ChecksumCreate_options  
Comment

=== added file 'mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt'
--- a/mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt  1970-01-01 
00:00:00 +
+++ b/mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt  2009-08-31 
11:07:44 +
@@ -0,0 +1 @@
+--lower_case_table_names

=== added file 'mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt'
--- a/mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt 1970-01-01 
00:00:00 +
+++ b/mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt 2009-08-31 
11:07:44 +
@@ -0,0 +1 @@
+--lower_case_table_names

=== added file 'mysql-test/suite/pbxt/t/lowercase_view-master.opt'
--- a/mysql-test/suite/pbxt/t/lowercase_view-master.opt 1970-01-01 00:00:00 
+
+++ b/mysql-test/suite/pbxt/t/lowercase_view-master.opt 2009-08-31 11:07:44 
+
@@ -0,0 +1 @@
+--lower_case_table_nam

Re: [Maria-developers] MariaDB versioning

2009-08-31 Thread Henrik Ingo
Hi Peter...

On Sun, Aug 30, 2009 at 5:47 PM, Peter Laursen wrote:
> I have a concern that I will ask you all to consider while there is
> time.  I think I understand that after MariaDB 5.1 a 5.2 release is
> planned.  I think it should not be versioned like that.  Problem is that
> there is a MySQL 5.2 tree too (it is basically an early 6.0) and it is
> still available for download from FTP-mirrors like
> ftp://mirrors.dotsrc.org/mysql/Downloads/ .

And at Webyog you strive to actually support that version?

> For generic and GUI clients (ie. not designed for specific server
> versions and where SQL is generated and not written by user) it is
> important that the version string can be used to identify what SQL
> statements are supported by server. The first thing such clients (like
> our own SQLyog) does after connection is to SELECT VERSION() .. and only
> after that we know if there is support for EVENTS, if IF EXISTS is
> supported for DROP TRIGGER sysntax and so on.  If there are two
> different 5.2 trees (MariaDB based on MySQL 5.1 and MySQL 5.2) it gets
> more difficult to handle.
> .
> I asked Monty about this at one of his sessions at the latest UC and he
> told like 'we are good citizens - except for the comment field MariaDB
> will be versioned like the MySQL code it is based upon'. What I also
> think is the best solution. The *version* should not be the same for
> different builds with even the slightest difference in what SQL server
> understands. On the opposite version should be the same as long as SQL-
> interface (even with possible Engine-specific extensions) is the same no
> matter how much they differ internally.
>
> Maybe in the long run diversification is inevitable.  But in that case
> it should be planned well!

>From your point of view, how should we identify a release that

- Uses MySQL 5.1 as baseline
- Note: MariaDB 5.1 also uses MySQL 5.1 as baseline
- Has more features than MariaDB 5.1

?

henrik

-- 
email: henrik.i...@avoinelama.fi
tel:   +358-40-5697354
www:   www.avoinelama.fi/~hingo
book:  www.openlife.cc

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp