November 2009 - developers - lists.mariadb.org

[Maria-developers] Updated (by Knielsen): User-defined variables set that call UDFs (64)
by worklog-noreply＠askmonty.org 15 Nov '09

15 Nov '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: User-defined variables set that call UDFs CREATION DATE..: Sun, 15 Nov 2009, 19:22 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: Monty CATEGORY.......: Server-RawIdeaBin TASK ID........: 64 (http://askmonty.org/worklog/?tid=64) VERSION........: WorkLog-3.4 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Knielsen - Sun, 15 Nov 2009, 20:37)=-=- High Level Description modified. --- /tmp/wklog.64.old.21525 2009-11-15 18:37:23.000000000 +0000 +++ /tmp/wklog.64.new.21525 2009-11-15 18:37:23.000000000 +0000 @@ -9,4 +9,11 @@ But this would require a change to how variables are handled, and suggested I create this worklog item. +Comment by Sergei Golubchik: + +"This wouldn't require a change to how variables are handled, what it +*would* require is WL#2974 (turning UDF into plugins). + +All plugins natively can add new server variables and execute any +arbitrary code when they're assigned to." DESCRIPTION: I was talking to Monty about how with the memcached Functions for MySQL, I call: mysql> do memc_servers_set('127.0.0.1:11211'); Instead, he suggests that it would be preferable to do: set @@memc_servers = '127.0.0.1:11211'; But this would require a change to how variables are handled, and suggested I create this worklog item. Comment by Sergei Golubchik: "This wouldn't require a change to how variables are handled, what it *would* require is WL#2974 (turning UDF into plugins). All plugins natively can add new server variables and execute any arbitrary code when they're assigned to." ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Updated (by Knielsen): User-defined variables set that call UDFs (64)
by worklog-noreply＠askmonty.org 15 Nov '09

15 Nov '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: User-defined variables set that call UDFs CREATION DATE..: Sun, 15 Nov 2009, 19:22 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: Monty CATEGORY.......: Server-RawIdeaBin TASK ID........: 64 (http://askmonty.org/worklog/?tid=64) VERSION........: WorkLog-3.4 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: -=-=(Knielsen - Sun, 15 Nov 2009, 20:37)=-=- High Level Description modified. --- /tmp/wklog.64.old.21525 2009-11-15 18:37:23.000000000 +0000 +++ /tmp/wklog.64.new.21525 2009-11-15 18:37:23.000000000 +0000 @@ -9,4 +9,11 @@ But this would require a change to how variables are handled, and suggested I create this worklog item. +Comment by Sergei Golubchik: + +"This wouldn't require a change to how variables are handled, what it +*would* require is WL#2974 (turning UDF into plugins). + +All plugins natively can add new server variables and execute any +arbitrary code when they're assigned to." DESCRIPTION: I was talking to Monty about how with the memcached Functions for MySQL, I call: mysql> do memc_servers_set('127.0.0.1:11211'); Instead, he suggests that it would be preferable to do: set @@memc_servers = '127.0.0.1:11211'; But this would require a change to how variables are handled, and suggested I create this worklog item. Comment by Sergei Golubchik: "This wouldn't require a change to how variables are handled, what it *would* require is WL#2974 (turning UDF into plugins). All plugins natively can add new server variables and execute any arbitrary code when they're assigned to." ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] New (by CaptTofu): User-defined variables set that call UDFs (64)
by worklog-noreply＠askmonty.org 15 Nov '09

15 Nov '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: User-defined variables set that call UDFs CREATION DATE..: Sun, 15 Nov 2009, 19:22 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: Monty CATEGORY.......: Server-RawIdeaBin TASK ID........: 64 (http://askmonty.org/worklog/?tid=64) VERSION........: WorkLog-3.4 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: I was talking to Monty about how with the memcached Functions for MySQL, I call: mysql> do memc_servers_set('127.0.0.1:11211'); Instead, he suggests that it would be preferable to do: set @@memc_servers = '127.0.0.1:11211'; But this would require a change to how variables are handled, and suggested I create this worklog item. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

2 1

[Maria-developers] New (by CaptTofu): User-defined variables set that call UDFs (64)
by worklog-noreply＠askmonty.org 15 Nov '09

15 Nov '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: User-defined variables set that call UDFs CREATION DATE..: Sun, 15 Nov 2009, 19:22 SUPERVISOR.....: Monty IMPLEMENTOR....: COPIES TO......: Monty CATEGORY.......: Server-RawIdeaBin TASK ID........: 64 (http://askmonty.org/worklog/?tid=64) VERSION........: WorkLog-3.4 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: I was talking to Monty about how with the memcached Functions for MySQL, I call: mysql> do memc_servers_set('127.0.0.1:11211'); Instead, he suggests that it would be preferable to do: set @@memc_servers = '127.0.0.1:11211'; But this would require a change to how variables are handled, and suggested I create this worklog item. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2764: Merge MariaDB 5.1.39 release, including XtraDB 8 merge, into MariaDB 5.1 trunk.
by noreply＠launchpad.net 14 Nov '09

14 Nov '09

Merge authors: Aleksandr Kuzminsky (akuzminsky) Kristian Nielsen (knielsen) ------------------------------------------------------------ revno: 2764 [merge] committer: knielsen(a)knielsen-hq.org branch nick: mariadb-5.1 timestamp: Sat 2009-11-14 13:45:36 +0100 message: Merge MariaDB 5.1.39 release, including XtraDB 8 merge, into MariaDB 5.1 trunk. removed: mysql-test/suite/innodb/r/innodb_file_format.result mysql-test/suite/innodb/t/innodb_file_format.test storage/xtradb/ut/ut0auxconf.c added: mysql-test/r/innodb_file_format.result mysql-test/t/innodb_file_format.test storage/xtradb/COPYING.Percona storage/xtradb/COPYING.Sun_Microsystems storage/xtradb/Doxyfile storage/xtradb/include/fsp0types.h storage/xtradb/ut/ut0auxconf_atomic_pthread_t_gcc.c storage/xtradb/ut/ut0auxconf_atomic_pthread_t_solaris.c storage/xtradb/ut/ut0auxconf_have_solaris_atomics.c storage/xtradb/ut/ut0auxconf_pause.c storage/xtradb/ut/ut0auxconf_sizeof_pthread_t.c renamed: mysql-test/suite/innodb/r/innodb_bug44032.result => mysql-test/r/innodb_bug44032.result mysql-test/suite/innodb/t/innodb_bug44032.test => mysql-test/t/innodb_bug44032.test modified: configure.in mysql-test/include/index_merge2.inc mysql-test/r/index_merge_innodb.result mysql-test/r/index_merge_myisam.result mysql-test/r/innodb-autoinc.result mysql-test/r/innodb-index.result mysql-test/r/innodb.result mysql-test/r/innodb_bug36169.result mysql-test/t/innodb-autoinc.test mysql-test/t/innodb-index.test mysql-test/t/innodb.test mysql-test/t/innodb_bug36169.test mysql-test/t/innodb_bug36172.test storage/federatedx/Makefile.am storage/federatedx/ha_federatedx.cc storage/xtradb/CMakeLists.txt storage/xtradb/ChangeLog storage/xtradb/Makefile.am storage/xtradb/btr/btr0btr.c storage/xtradb/btr/btr0cur.c storage/xtradb/btr/btr0pcur.c storage/xtradb/btr/btr0sea.c storage/xtradb/buf/buf0buddy.c storage/xtradb/buf/buf0buf.c storage/xtradb/buf/buf0flu.c storage/xtradb/buf/buf0lru.c storage/xtradb/buf/buf0rea.c storage/xtradb/data/data0data.c storage/xtradb/data/data0type.c storage/xtradb/dict/dict0boot.c storage/xtradb/dict/dict0crea.c storage/xtradb/dict/dict0dict.c storage/xtradb/dict/dict0load.c storage/xtradb/dict/dict0mem.c storage/xtradb/dyn/dyn0dyn.c storage/xtradb/eval/eval0eval.c storage/xtradb/eval/eval0proc.c storage/xtradb/fil/fil0fil.c storage/xtradb/fsp/fsp0fsp.c storage/xtradb/fut/fut0fut.c storage/xtradb/fut/fut0lst.c storage/xtradb/ha/ha0ha.c storage/xtradb/ha/ha0storage.c storage/xtradb/ha/hash0hash.c storage/xtradb/handler/ha_innodb.cc storage/xtradb/handler/ha_innodb.h storage/xtradb/handler/handler0alter.cc storage/xtradb/handler/handler0vars.h storage/xtradb/handler/i_s.cc storage/xtradb/handler/i_s.h storage/xtradb/handler/innodb_patch_info.h storage/xtradb/handler/mysql_addons.cc storage/xtradb/handler/win_delay_loader.cc storage/xtradb/ibuf/ibuf0ibuf.c storage/xtradb/include/btr0btr.h storage/xtradb/include/btr0btr.ic storage/xtradb/include/btr0cur.h storage/xtradb/include/btr0cur.ic storage/xtradb/include/btr0pcur.h storage/xtradb/include/btr0pcur.ic storage/xtradb/include/btr0sea.h storage/xtradb/include/btr0sea.ic storage/xtradb/include/btr0types.h storage/xtradb/include/buf0buddy.h storage/xtradb/include/buf0buddy.ic storage/xtradb/include/buf0buf.h storage/xtradb/include/buf0buf.ic storage/xtradb/include/buf0flu.h storage/xtradb/include/buf0flu.ic storage/xtradb/include/buf0lru.h storage/xtradb/include/buf0lru.ic storage/xtradb/include/buf0rea.h storage/xtradb/include/buf0types.h storage/xtradb/include/data0data.h storage/xtradb/include/data0data.ic storage/xtradb/include/data0type.h storage/xtradb/include/data0type.ic storage/xtradb/include/data0types.h storage/xtradb/include/db0err.h storage/xtradb/include/dict0boot.h storage/xtradb/include/dict0boot.ic storage/xtradb/include/dict0crea.h storage/xtradb/include/dict0crea.ic storage/xtradb/include/dict0dict.h storage/xtradb/include/dict0dict.ic storage/xtradb/include/dict0load.h storage/xtradb/include/dict0load.ic storage/xtradb/include/dict0mem.h storage/xtradb/include/dict0mem.ic storage/xtradb/include/dict0types.h storage/xtradb/include/dyn0dyn.h storage/xtradb/include/dyn0dyn.ic storage/xtradb/include/eval0eval.h storage/xtradb/include/eval0eval.ic storage/xtradb/include/eval0proc.h storage/xtradb/include/eval0proc.ic storage/xtradb/include/fil0fil.h storage/xtradb/include/fsp0fsp.h storage/xtradb/include/fsp0fsp.ic storage/xtradb/include/fut0fut.h storage/xtradb/include/fut0fut.ic storage/xtradb/include/fut0lst.h storage/xtradb/include/fut0lst.ic storage/xtradb/include/ha0ha.h storage/xtradb/include/ha0ha.ic storage/xtradb/include/ha0storage.h storage/xtradb/include/ha0storage.ic storage/xtradb/include/ha_prototypes.h storage/xtradb/include/handler0alter.h storage/xtradb/include/hash0hash.h storage/xtradb/include/hash0hash.ic storage/xtradb/include/ibuf0ibuf.h storage/xtradb/include/ibuf0ibuf.ic storage/xtradb/include/ibuf0types.h storage/xtradb/include/lock0iter.h storage/xtradb/include/lock0lock.h storage/xtradb/include/lock0lock.ic storage/xtradb/include/lock0priv.h storage/xtradb/include/lock0priv.ic storage/xtradb/include/lock0types.h storage/xtradb/include/log0log.h storage/xtradb/include/log0log.ic storage/xtradb/include/log0recv.h storage/xtradb/include/log0recv.ic storage/xtradb/include/mach0data.h storage/xtradb/include/mach0data.ic storage/xtradb/include/mem0dbg.h storage/xtradb/include/mem0dbg.ic storage/xtradb/include/mem0mem.h storage/xtradb/include/mem0mem.ic storage/xtradb/include/mem0pool.h storage/xtradb/include/mem0pool.ic storage/xtradb/include/mtr0log.h storage/xtradb/include/mtr0log.ic storage/xtradb/include/mtr0mtr.h storage/xtradb/include/mtr0mtr.ic storage/xtradb/include/mtr0types.h storage/xtradb/include/mysql_addons.h storage/xtradb/include/os0file.h storage/xtradb/include/os0proc.h storage/xtradb/include/os0proc.ic storage/xtradb/include/os0sync.h storage/xtradb/include/os0sync.ic storage/xtradb/include/os0thread.h storage/xtradb/include/os0thread.ic storage/xtradb/include/page0cur.h storage/xtradb/include/page0cur.ic storage/xtradb/include/page0page.h storage/xtradb/include/page0page.ic storage/xtradb/include/page0types.h storage/xtradb/include/page0zip.h storage/xtradb/include/page0zip.ic storage/xtradb/include/pars0opt.h storage/xtradb/include/pars0opt.ic storage/xtradb/include/pars0pars.h storage/xtradb/include/pars0pars.ic storage/xtradb/include/pars0sym.h storage/xtradb/include/pars0sym.ic storage/xtradb/include/pars0types.h storage/xtradb/include/que0que.h storage/xtradb/include/que0que.ic storage/xtradb/include/que0types.h storage/xtradb/include/read0read.h storage/xtradb/include/read0read.ic storage/xtradb/include/read0types.h storage/xtradb/include/rem0cmp.h storage/xtradb/include/rem0cmp.ic storage/xtradb/include/rem0rec.h storage/xtradb/include/rem0rec.ic storage/xtradb/include/rem0types.h storage/xtradb/include/row0ext.h storage/xtradb/include/row0ext.ic storage/xtradb/include/row0ins.h storage/xtradb/include/row0ins.ic storage/xtradb/include/row0merge.h storage/xtradb/include/row0mysql.h storage/xtradb/include/row0mysql.ic storage/xtradb/include/row0purge.h storage/xtradb/include/row0purge.ic storage/xtradb/include/row0row.h storage/xtradb/include/row0row.ic storage/xtradb/include/row0sel.h storage/xtradb/include/row0sel.ic storage/xtradb/include/row0types.h storage/xtradb/include/row0uins.h storage/xtradb/include/row0uins.ic storage/xtradb/include/row0umod.h storage/xtradb/include/row0umod.ic storage/xtradb/include/row0undo.h storage/xtradb/include/row0undo.ic storage/xtradb/include/row0upd.h storage/xtradb/include/row0upd.ic storage/xtradb/include/row0vers.h storage/xtradb/include/row0vers.ic storage/xtradb/include/srv0que.h storage/xtradb/include/srv0srv.h storage/xtradb/include/srv0srv.ic storage/xtradb/include/srv0start.h storage/xtradb/include/sync0arr.h storage/xtradb/include/sync0arr.ic storage/xtradb/include/sync0rw.h storage/xtradb/include/sync0rw.ic storage/xtradb/include/sync0sync.h storage/xtradb/include/sync0sync.ic storage/xtradb/include/sync0types.h storage/xtradb/include/thr0loc.h storage/xtradb/include/thr0loc.ic storage/xtradb/include/trx0i_s.h storage/xtradb/include/trx0purge.h storage/xtradb/include/trx0purge.ic storage/xtradb/include/trx0rec.h storage/xtradb/include/trx0rec.ic storage/xtradb/include/trx0roll.h storage/xtradb/include/trx0roll.ic storage/xtradb/include/trx0rseg.h storage/xtradb/include/trx0rseg.ic storage/xtradb/include/trx0sys.h storage/xtradb/include/trx0sys.ic storage/xtradb/include/trx0trx.h storage/xtradb/include/trx0trx.ic storage/xtradb/include/trx0types.h storage/xtradb/include/trx0undo.h storage/xtradb/include/trx0undo.ic storage/xtradb/include/trx0xa.h storage/xtradb/include/univ.i storage/xtradb/include/usr0sess.h storage/xtradb/include/usr0sess.ic storage/xtradb/include/usr0types.h storage/xtradb/include/ut0auxconf.h storage/xtradb/include/ut0byte.h storage/xtradb/include/ut0byte.ic storage/xtradb/include/ut0dbg.h storage/xtradb/include/ut0list.h storage/xtradb/include/ut0list.ic storage/xtradb/include/ut0lst.h storage/xtradb/include/ut0mem.h storage/xtradb/include/ut0mem.ic storage/xtradb/include/ut0rnd.h storage/xtradb/include/ut0rnd.ic storage/xtradb/include/ut0sort.h storage/xtradb/include/ut0ut.h storage/xtradb/include/ut0ut.ic storage/xtradb/include/ut0vec.h storage/xtradb/include/ut0vec.ic storage/xtradb/include/ut0wqueue.h storage/xtradb/lock/lock0iter.c storage/xtradb/lock/lock0lock.c storage/xtradb/log/log0log.c storage/xtradb/log/log0recv.c storage/xtradb/mach/mach0data.c storage/xtradb/mem/mem0dbg.c storage/xtradb/mem/mem0mem.c storage/xtradb/mem/mem0pool.c storage/xtradb/mtr/mtr0log.c storage/xtradb/mtr/mtr0mtr.c storage/xtradb/os/os0file.c storage/xtradb/os/os0proc.c storage/xtradb/os/os0sync.c storage/xtradb/os/os0thread.c storage/xtradb/page/page0cur.c storage/xtradb/page/page0page.c storage/xtradb/page/page0zip.c storage/xtradb/pars/lexyy.c storage/xtradb/pars/pars0lex.l storage/xtradb/pars/pars0opt.c storage/xtradb/pars/pars0pars.c storage/xtradb/pars/pars0sym.c storage/xtradb/plug.in storage/xtradb/que/que0que.c storage/xtradb/read/read0read.c storage/xtradb/rem/rem0cmp.c storage/xtradb/rem/rem0rec.c storage/xtradb/row/row0ext.c storage/xtradb/row/row0ins.c storage/xtradb/row/row0merge.c storage/xtradb/row/row0mysql.c storage/xtradb/row/row0purge.c storage/xtradb/row/row0row.c storage/xtradb/row/row0sel.c storage/xtradb/row/row0uins.c storage/xtradb/row/row0umod.c storage/xtradb/row/row0undo.c storage/xtradb/row/row0upd.c storage/xtradb/row/row0vers.c storage/xtradb/srv/srv0que.c storage/xtradb/srv/srv0srv.c storage/xtradb/srv/srv0start.c storage/xtradb/sync/sync0arr.c storage/xtradb/sync/sync0rw.c storage/xtradb/sync/sync0sync.c storage/xtradb/thr/thr0loc.c storage/xtradb/trx/trx0i_s.c storage/xtradb/trx/trx0purge.c storage/xtradb/trx/trx0rec.c storage/xtradb/trx/trx0roll.c storage/xtradb/trx/trx0rseg.c storage/xtradb/trx/trx0sys.c storage/xtradb/trx/trx0trx.c storage/xtradb/trx/trx0undo.c storage/xtradb/usr/usr0sess.c storage/xtradb/ut/ut0byte.c storage/xtradb/ut/ut0dbg.c storage/xtradb/ut/ut0list.c storage/xtradb/ut/ut0mem.c storage/xtradb/ut/ut0rnd.c storage/xtradb/ut/ut0ut.c storage/xtradb/ut/ut0vec.c storage/xtradb/ut/ut0wqueue.c storage/xtradb/win-plugin/README storage/xtradb/win-plugin/win-plugin.diff The size of the diff (120074 lines) is larger than your specified limit of 5000 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.

1 0

[Maria-developers] Go for MariaDB 5.1.39 release
by Kristian Nielsen 14 Nov '09

14 Nov '09

I pushed the final fixes, including the merge of XtraDB, into the release branch: lp:~maria-captains/maria/5.1-release I tagged the latest revision with the tag tag:mariadb-5.1.39-beta Daniel, for the release notes please mark that this release is based on MySQL 5.1.39 and XtraDB 8 (which has InnoDB plugin 1.0.4 as base). Arjen, we are now go for final release build. Hopefully we can be ready for release Tuesday, which according to my information would allow Monty to announce the release at OpenSQL Camp. You can use tarbake51/sh tag:mariadb-5.1.39-beta lp:~maria-captains/maria/5.1-release to be 100% sure to grab the right revision for the release (or whatever variant fits your build infrastructure best). There is still the mysql_client_test failure on Ubuntu 9.10 Karmic. We need to fix this for the next MariaDB 5.1.41 release. There are also other failures seen in Buildbot, including - A number of sporadic test failures that occur only occasionally. - Windows test failures. - Solaris build failure and Mac test failures. - Test failures on non-max builds. For these reasons I think it is correct to still call this release only a Beta. We should fix these issues for 5.1.41, and if no serious new issues are reported on 5.1.39 I think we can plan for 5.1.41 to be a release candidate. - Kristian.

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2768)
by knielsen＠knielsen-hq.org 14 Nov '09

14 Nov '09

#At lp:maria 2768 knielsen(a)knielsen-hq.org 2009-11-14 XtraDB 8 after-merge fix: Fix windows build. modified: storage/xtradb/CMakeLists.txt === modified file 'storage/xtradb/CMakeLists.txt' --- a/storage/xtradb/CMakeLists.txt 2009-11-13 21:26:08 +0000 +++ b/storage/xtradb/CMakeLists.txt 2009-11-14 09:53:18 +0000 @@ -44,7 +44,7 @@ IF(MSVC AND $(WIN64)) PROPERTIES COMPILE_FLAGS -Od) ENDIF(MSVC AND $(WIN64)) -SET(INNODB_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c +SET(INNOBASE_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c buf/buf0buddy.c buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c data/data0data.c data/data0type.c dict/dict0boot.c dict/dict0crea.c dict/dict0dict.c dict/dict0load.c dict/dict0mem.c

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2767)
by knielsen＠knielsen-hq.org 14 Nov '09

14 Nov '09

#At lp:maria 2767 knielsen(a)knielsen-hq.org 2009-11-14 XtraDB 8 after-merge fixes: fix forgotten manual merge of patch file. modified: mysql-test/include/index_merge2.inc mysql-test/r/index_merge_innodb.result mysql-test/r/index_merge_myisam.result === modified file 'mysql-test/include/index_merge2.inc' --- a/mysql-test/include/index_merge2.inc 2006-09-14 19:44:17 +0000 +++ b/mysql-test/include/index_merge2.inc 2009-11-14 01:15:03 +0000 @@ -122,12 +122,14 @@ insert into t1 (key1a, key1b, key2a, key analyze table t1; select count(*) from t1; +--replace_column 9 REF explain select count(*) from t1 where key1a = 2 and key1b is null and key2a = 2 and key2b is null; select count(*) from t1 where key1a = 2 and key1b is null and key2a = 2 and key2b is null; +--replace_column 9 REF explain select count(*) from t1 where key1a = 2 and key1b is null and key3a = 2 and key3b is null; === modified file 'mysql-test/r/index_merge_innodb.result' --- a/mysql-test/r/index_merge_innodb.result 2009-06-09 13:19:13 +0000 +++ b/mysql-test/r/index_merge_innodb.result 2009-11-14 01:15:03 +0000 @@ -111,7 +111,7 @@ count(*) explain select count(*) from t1 where key1a = 2 and key1b is null and key2a = 2 and key2b is null; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index_merge i1,i2 i1,i2 10,10 NULL 3 Using intersect(i1,i2); Using where; Using index +1 SIMPLE t1 index_merge i1,i2 i1,i2 10,10 NULL REF Using intersect(i1,i2); Using where; Using index select count(*) from t1 where key1a = 2 and key1b is null and key2a = 2 and key2b is null; count(*) @@ -119,7 +119,7 @@ count(*) explain select count(*) from t1 where key1a = 2 and key1b is null and key3a = 2 and key3b is null; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index_merge i1,i3 i1,i3 10,10 NULL 3 Using intersect(i1,i3); Using where; Using index +1 SIMPLE t1 index_merge i1,i3 i1,i3 10,10 NULL REF Using intersect(i1,i3); Using where; Using index select count(*) from t1 where key1a = 2 and key1b is null and key3a = 2 and key3b is null; count(*) === modified file 'mysql-test/r/index_merge_myisam.result' --- a/mysql-test/r/index_merge_myisam.result 2009-06-15 14:36:51 +0000 +++ b/mysql-test/r/index_merge_myisam.result 2009-11-14 01:15:03 +0000 @@ -945,7 +945,7 @@ count(*) explain select count(*) from t1 where key1a = 2 and key1b is null and key2a = 2 and key2b is null; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index_merge i1,i2 i1,i2 10,10 NULL 2 Using intersect(i1,i2); Using where; Using index +1 SIMPLE t1 index_merge i1,i2 i1,i2 10,10 NULL REF Using intersect(i1,i2); Using where; Using index select count(*) from t1 where key1a = 2 and key1b is null and key2a = 2 and key2b is null; count(*) @@ -953,7 +953,7 @@ count(*) explain select count(*) from t1 where key1a = 2 and key1b is null and key3a = 2 and key3b is null; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index_merge i1,i3 i1,i3 10,10 NULL 2 Using intersect(i1,i3); Using where; Using index +1 SIMPLE t1 index_merge i1,i3 i1,i3 10,10 NULL REF Using intersect(i1,i3); Using where; Using index select count(*) from t1 where key1a = 2 and key1b is null and key3a = 2 and key3b is null; count(*)

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2766)
by knielsen＠knielsen-hq.org 13 Nov '09

13 Nov '09

#At lp:maria 2766 knielsen(a)knielsen-hq.org 2009-11-13 XtraDB 8 after-merge fix: Add missing header to `make dist`. modified: storage/xtradb/Makefile.am === modified file 'storage/xtradb/Makefile.am' --- a/storage/xtradb/Makefile.am 2009-11-13 21:26:08 +0000 +++ b/storage/xtradb/Makefile.am 2009-11-13 22:53:04 +0000 @@ -78,6 +78,7 @@ noinst_HEADERS= \ include/fil0fil.h \ include/fsp0fsp.h \ include/fsp0fsp.ic \ + include/fsp0types.h \ include/fut0fut.h \ include/fut0fut.ic \ include/fut0lst.h \

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2765)
by knielsen＠knielsen-hq.org 13 Nov '09

13 Nov '09

#At lp:maria 2765 knielsen(a)knielsen-hq.org 2009-11-13 [merge] Merge XtraDB 8. modified: storage/federatedx/Makefile.am storage/federatedx/ha_federatedx.cc === modified file 'storage/federatedx/Makefile.am' --- a/storage/federatedx/Makefile.am 2009-11-01 15:09:55 +0000 +++ b/storage/federatedx/Makefile.am 2009-11-10 13:55:48 +0000 @@ -22,7 +22,6 @@ pkgplugin_LTLIBRARIES = @plugin_federate ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) ha_federatedx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federatedx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -ha_federatedx_la_SOURCES = ha_federatedx.cc EXTRA_LIBRARIES = libfederatedx.a === modified file 'storage/federatedx/ha_federatedx.cc' --- a/storage/federatedx/ha_federatedx.cc 2009-11-03 11:08:09 +0000 +++ b/storage/federatedx/ha_federatedx.cc 2009-11-10 08:35:39 +0000 @@ -390,8 +390,8 @@ int federatedx_db_init(void *p) DBUG_ENTER("federatedx_db_init"); handlerton *federatedx_hton= (handlerton *)p; federatedx_hton->state= SHOW_OPTION_YES; - /* This is no longer needed for plugin storage engines */ - federatedx_hton->db_type= DB_TYPE_DEFAULT; + /* Needed to work with old .frm files */ + federatedx_hton->db_type= DB_TYPE_FEDERATED_DB; federatedx_hton->savepoint_offset= sizeof(ulong); federatedx_hton->close_connection= ha_federatedx::disconnect; federatedx_hton->savepoint_set= ha_federatedx::savepoint_set;

1 0