At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2837 revision-id: sergii@pisem.net-20100826064508-hqg2wigw8zyn3vnn parent: sergii@pisem.net-20100826064253-13u0n7ffz1t59ek6 committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.2 timestamp: Thu 2010-08-26 08:45:08 +0200 message: restore shifted error numbers. build federared* with libmysqlservices === modified file 'mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result' --- a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result 2010-07-13 14:34:14 +0000 +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result 2010-08-26 06:45:08 +0000 @@ -25,8 +25,8 @@ a b c # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols insert into t1 values (1,2,3); Warnings: -Warning 1645 The value specified for computed column 'b' in table 't1' ignored -Warning 1645 The value specified for computed column 'c' in table 't1' ignored +Warning 1647 The value specified for computed column 'b' in table 't1' ignored +Warning 1647 The value specified for computed column 'c' in table 't1' ignored select * from t1; a b c 1 -1 -1 @@ -65,8 +65,8 @@ a b c # against vcols insert into t1 (a,b) values (1,3), (2,4); Warnings: -Warning 1645 The value specified for computed column 'b' in table 't1' ignored -Warning 1645 The value specified for computed column 'b' in table 't1' ignored +Warning 1647 The value specified for computed column 'b' in table 't1' ignored +Warning 1647 The value specified for computed column 'b' in table 't1' ignored select * from t1; a b c 1 -1 -1 @@ -107,8 +107,8 @@ a b c create table t2 like t1; insert into t2 select * from t1; Warnings: -Warning 1645 The value specified for computed column 'b' in table 't2' ignored -Warning 1645 The value specified for computed column 'c' in table 't2' ignored +Warning 1647 The value specified for computed column 'b' in table 't2' ignored +Warning 1647 The value specified for computed column 'c' in table 't2' ignored select * from t1; a b c 2 -2 -2 @@ -123,8 +123,8 @@ a b c create table t2 like t1; insert into t2 (a,b) select a,b from t1; Warnings: -Warning 1645 The value specified for computed column 'b' in table 't2' ignored -Warning 1645 The value specified for computed column 'b' in table 't2' ignored +Warning 1647 The value specified for computed column 'b' in table 't2' ignored +Warning 1647 The value specified for computed column 'b' in table 't2' ignored select * from t2; a b c 2 -2 -2 @@ -159,7 +159,7 @@ a b c 2 -2 -2 update t1 set c=3 where a=2; Warnings: -Warning 1645 The value specified for computed column 'c' in table 't1' ignored +Warning 1647 The value specified for computed column 'c' in table 't1' ignored select * from t1; a b c 1 -1 -1 @@ -189,7 +189,7 @@ a b c 2 -2 -2 update t1 set c=3 where b=-2; Warnings: -Warning 1645 The value specified for computed column 'c' in table 't1' ignored +Warning 1647 The value specified for computed column 'c' in table 't1' ignored select * from t1; a b c 1 -1 -1 === modified file 'mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result' --- a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result 2010-07-13 14:34:14 +0000 +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result 2010-08-26 06:45:08 +0000 @@ -25,8 +25,8 @@ a b c # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols insert into t1 values (1,2,3); Warnings: -Warning 1645 The value specified for computed column 'b' in table 't1' ignored -Warning 1645 The value specified for computed column 'c' in table 't1' ignored +Warning 1647 The value specified for computed column 'b' in table 't1' ignored +Warning 1647 The value specified for computed column 'c' in table 't1' ignored select * from t1; a b c 1 -1 -1 @@ -65,8 +65,8 @@ a b c # against vcols insert into t1 (a,b) values (1,3), (2,4); Warnings: -Warning 1645 The value specified for computed column 'b' in table 't1' ignored -Warning 1645 The value specified for computed column 'b' in table 't1' ignored +Warning 1647 The value specified for computed column 'b' in table 't1' ignored +Warning 1647 The value specified for computed column 'b' in table 't1' ignored select * from t1; a b c 1 -1 -1 @@ -107,8 +107,8 @@ a b c create table t2 like t1; insert into t2 select * from t1; Warnings: -Warning 1645 The value specified for computed column 'b' in table 't2' ignored -Warning 1645 The value specified for computed column 'c' in table 't2' ignored +Warning 1647 The value specified for computed column 'b' in table 't2' ignored +Warning 1647 The value specified for computed column 'c' in table 't2' ignored select * from t1; a b c 2 -2 -2 @@ -123,8 +123,8 @@ a b c create table t2 like t1; insert into t2 (a,b) select a,b from t1; Warnings: -Warning 1645 The value specified for computed column 'b' in table 't2' ignored -Warning 1645 The value specified for computed column 'b' in table 't2' ignored +Warning 1647 The value specified for computed column 'b' in table 't2' ignored +Warning 1647 The value specified for computed column 'b' in table 't2' ignored select * from t2; a b c 2 -2 -2 @@ -159,7 +159,7 @@ a b c 2 -2 -2 update t1 set c=3 where a=2; Warnings: -Warning 1645 The value specified for computed column 'c' in table 't1' ignored +Warning 1647 The value specified for computed column 'c' in table 't1' ignored select * from t1; a b c 1 -1 -1 @@ -189,7 +189,7 @@ a b c 2 -2 -2 update t1 set c=3 where b=-2; Warnings: -Warning 1645 The value specified for computed column 'c' in table 't1' ignored +Warning 1647 The value specified for computed column 'c' in table 't1' ignored select * from t1; a b c 1 -1 -1 === modified file 'sql/share/errmsg.txt' --- a/sql/share/errmsg.txt 2010-07-13 14:34:14 +0000 +++ b/sql/share/errmsg.txt 2010-08-26 06:45:08 +0000 @@ -6207,6 +6207,13 @@ ER_TOO_MANY_CONCURRENT_TRXS WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED eng "Non-ASCII separator arguments are not fully supported" +ER_DEBUG_SYNC_TIMEOUT + eng "debug sync point wait timed out" + ger "Debug Sync Point Wartezeit �berschritten" +ER_DEBUG_SYNC_HIT_LIMIT + eng "debug sync point hit limit reached" + ger "Debug Sync Point Hit Limit erreicht" + ER_VCOL_BASED_ON_VCOL eng "A computed column cannot be based on a computed column" @@ -6236,14 +6243,6 @@ ER_CONST_EXPR_IN_VCOL ER_ROW_EXPR_FOR_VCOL eng "Expression for computed column cannot return a row" - -ER_DEBUG_SYNC_TIMEOUT - eng "debug sync point wait timed out" - ger "Debug Sync Point Wartezeit �berschritten" -ER_DEBUG_SYNC_HIT_LIMIT - eng "debug sync point hit limit reached" - ger "Debug Sync Point Hit Limit erreicht" - ER_UNKNOWN_OPTION eng "Unknown option '%-.64s'" ER_BAD_OPTION_VALUE === modified file 'storage/federated/Makefile.am' --- a/storage/federated/Makefile.am 2010-06-09 21:29:18 +0000 +++ b/storage/federated/Makefile.am 2010-08-26 06:45:08 +0000 @@ -32,7 +32,8 @@ noinst_HEADERS = ha_federated.h EXTRA_LTLIBRARIES = ha_federated.la pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ -ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) +ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) \ + -L$(top_builddir)/libservices -lmysqlservices ha_federated_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federated_la_SOURCES = ha_federated.cc $(top_srcdir)/mysys/string.c === modified file 'storage/federatedx/Makefile.am' --- a/storage/federatedx/Makefile.am 2010-06-09 21:29:18 +0000 +++ b/storage/federatedx/Makefile.am 2010-08-26 06:45:08 +0000 @@ -19,7 +19,8 @@ noinst_HEADERS = ha_federatedx.h federat EXTRA_LTLIBRARIES = ha_federatedx.la pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@ -ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) +ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) \ + -L$(top_builddir)/libservices -lmysqlservices ha_federatedx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federatedx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN