#At file:///home/thek/Development/cpp/mysqlbzr/mysql-6.0-bugteam/ based on revid:kristofer.pettersson@stripped
3112 Kristofer Pettersson 2009-03-13 [merge]
Automerge
modified:
client/mysqldump.c
config/ac-macros/ha_ndbcluster.m4
config/ac-macros/plugins.m4
mysql-test/r/mysqldump.result
mysql-test/r/signal.result
mysql-test/r/signal_demo3.result
mysql-test/r/signal_utf32.result
mysql-test/r/variables.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
mysql-test/suite/sys_vars/r/server_id_basic_32.result
mysql-test/suite/sys_vars/r/server_id_basic_64.result
mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
mysql-test/t/mysqldump.test
mysql-test/t/variables.test
sql/mysql_priv.h
sql/mysqld.cc
sql/set_var.cc
sql/sql_plugin.cc
storage/falcon/plug.in
storage/maria/plug.in
=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c 2009-02-19 17:36:09 +0000
+++ b/client/mysqldump.c 2009-03-12 16:18:40 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright 2000-2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
=== modified file 'config/ac-macros/ha_ndbcluster.m4'
--- a/config/ac-macros/ha_ndbcluster.m4 2009-01-09 11:46:26 +0000
+++ b/config/ac-macros/ha_ndbcluster.m4 2009-03-13 13:18:32 +0000
@@ -347,42 +347,11 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
AC_SUBST([NDB_SIZEOF_LONG])
AC_SUBST([NDB_SIZEOF_LONG_LONG])
- AC_CONFIG_FILES(storage/ndb/include/Makefile dnl
- storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
- storage/ndb/docs/Makefile dnl
- storage/ndb/tools/Makefile dnl
- storage/ndb/src/common/debugger/Makefile dnl
- storage/ndb/src/common/debugger/signaldata/Makefile dnl
- storage/ndb/src/common/portlib/Makefile dnl
- storage/ndb/src/common/util/Makefile dnl
- storage/ndb/src/common/logger/Makefile dnl
- storage/ndb/src/common/transporter/Makefile dnl
- storage/ndb/src/common/mgmcommon/Makefile dnl
- storage/ndb/src/kernel/Makefile dnl
- storage/ndb/src/kernel/error/Makefile dnl
- storage/ndb/src/kernel/blocks/Makefile dnl
- storage/ndb/src/kernel/blocks/dbdict/Makefile dnl
- storage/ndb/src/kernel/blocks/dbdih/Makefile dnl
- storage/ndb/src/kernel/blocks/dblqh/Makefile dnl
- storage/ndb/src/kernel/blocks/dbtup/Makefile dnl
- storage/ndb/src/kernel/blocks/backup/Makefile dnl
- storage/ndb/src/kernel/vm/Makefile dnl
- storage/ndb/src/mgmapi/Makefile dnl
- storage/ndb/src/ndbapi/Makefile dnl
- storage/ndb/src/mgmsrv/Makefile dnl
- storage/ndb/src/mgmclient/Makefile dnl
- storage/ndb/src/cw/Makefile dnl
- storage/ndb/src/cw/cpcd/Makefile dnl
- storage/ndb/test/Makefile dnl
- storage/ndb/test/src/Makefile dnl
- storage/ndb/test/ndbapi/Makefile dnl
- storage/ndb/test/ndbapi/bank/Makefile dnl
- storage/ndb/test/tools/Makefile dnl
- storage/ndb/test/run-test/Makefile dnl
- storage/ndb/include/ndb_version.h storage/ndb/include/ndb_global.h dnl
- storage/ndb/include/ndb_types.h dnl
- storage/ndb/swig/Makefile dnl
- )
+ AC_CONFIG_FILES([
+ storage/ndb/include/ndb_version.h
+ storage/ndb/include/ndb_global.h
+ storage/ndb/include/ndb_types.h
+ ])
])
AC_SUBST(TEST_NDBCLUSTER)
=== modified file 'config/ac-macros/plugins.m4'
--- a/config/ac-macros/plugins.m4 2009-02-26 22:41:35 +0000
+++ b/config/ac-macros/plugins.m4 2009-03-13 13:18:32 +0000
@@ -477,10 +477,23 @@ dnl Although this is "pretty", it breaks
# Even if we don't build a plugin, we bundle its source into the dist
# file. So its Makefile (and Makefiles for any subdirs) must be
# generated for 'make dist' to work.
- m4_syscmd(test -f "$6/configure")
+ m4_syscmd([test -f "]$6[/configure"])
ifelse(m4_sysval, 0,
[AC_CONFIG_SUBDIRS($6)],
- [AC_CONFIG_FILES($6/Makefile)]
+ [
+ # autoconf doesn't provide an automatic way to configure DIST_SUBDIRS of
+ # a subdir; for our purposes, it's enough to just check for existing
+ # Makefile.am files and add them in here
+dnl
+dnl Warning, don't try to quote the m4_esyscmd() macro, it doesn't
+dnl work. Quoting here is tricky.
+dnl
+dnl The $FIND or $SED variable can be set by the user when calling autoconf itself
+dnl to if they need to pass a specific path. This is *NOT* used when calling
+dnl running configure!
+dnl
+ AC_CONFIG_FILES(m4_esyscmd([${FIND-find} "]$6[" -name Makefile.am -print | ${SED-sed} 's,\.am$,,']))
+ ]
)
ifelse(
=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result 2009-02-25 12:42:06 +0000
+++ b/mysql-test/r/mysqldump.result 2009-03-12 16:18:40 +0000
@@ -3816,6 +3816,73 @@ DROP TABLE t1,t2;
-- Dump completed on DATE
+SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
+#
+# Bug #42635: mysqldump includes views that were excluded using
+# the --ignore-table option
+#
+create database db42635;
+use db42635;
+create table t1 (id int);
+create view db42635.v1 (c) as select * from db42635.t1;
+create view db42635.v2 (c) as select * from db42635.t1;
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `t1`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t1` (
+ `id` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+LOCK TABLES `t1` WRITE;
+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
+UNLOCK TABLES;
+DROP TABLE IF EXISTS `v2`;
+/*!50001 DROP VIEW IF EXISTS `v2`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE TABLE `v2` (
+ `c` int(11)
+) ENGINE=MyISAM */;
+SET character_set_client = @saved_cs_client;
+/*!50001 DROP TABLE `v2`*/;
+/*!50001 DROP VIEW IF EXISTS `v2`*/;
+/*!50001 SET @saved_cs_client = @@character_set_client */;
+/*!50001 SET @saved_cs_results = @@character_set_results */;
+/*!50001 SET @saved_col_connection = @@collation_connection */;
+/*!50001 SET character_set_client = latin1 */;
+/*!50001 SET character_set_results = latin1 */;
+/*!50001 SET collation_connection = latin1_swedish_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `v2` AS select `t1`.`id` AS `c` from `t1` */;
+/*!50001 SET character_set_client = @saved_cs_client */;
+/*!50001 SET character_set_results = @saved_cs_results */;
+/*!50001 SET collation_connection = @saved_col_connection */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+use test;
+drop database db42635;
#
# Bug#33550 mysqldump 4.0 compatibility broken
#
=== modified file 'mysql-test/r/signal.result'
--- a/mysql-test/r/signal.result 2009-02-23 14:53:18 +0000
+++ b/mysql-test/r/signal.result 2009-03-13 09:43:12 +0000
@@ -580,7 +580,7 @@ SIGNAL foo;
ERROR 42000: Undefined CONDITION: foo
SIGNAL SQLSTATE '01000';
Warnings:
-Warning 1766 Unhandled user-defined warning condition
+Warning 1771 Unhandled user-defined warning condition
SIGNAL SQLSTATE '02000';
ERROR 02000: Unhandled user-defined not found condition
SIGNAL SQLSTATE '23000';
@@ -694,7 +694,7 @@ SIGNAL warn;
end $$
call test_signal() $$
Warnings:
-Warning 1766 Unhandled user-defined warning condition
+Warning 1771 Unhandled user-defined warning condition
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -704,7 +704,7 @@ SIGNAL warn;
end $$
call test_signal() $$
Warnings:
-Warning 1766 Unhandled user-defined warning condition
+Warning 1771 Unhandled user-defined warning condition
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -853,7 +853,7 @@ SIGNAL warn SET MESSAGE_TEXT = "Somethin
end $$
call test_signal() $$
Warnings:
-Warning 1766 Something bad happened
+Warning 1771 Something bad happened
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -878,7 +878,7 @@ SIGNAL something SET MESSAGE_TEXT = _utf
end $$
call test_signal() $$
Warnings:
-Warning 1766 This is a UTF8 text
+Warning 1771 This is a UTF8 text
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -887,7 +887,7 @@ SIGNAL something SET MESSAGE_TEXT = "";
end $$
call test_signal() $$
Warnings:
-Warning 1766
+Warning 1771
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -896,10 +896,10 @@ SIGNAL warn SET MESSAGE_TEXT = "á a";
end $$
call test_signal() $$
Warnings:
-Warning 1766 �
+Warning 1771 �
show warnings $$
Level Code Message
-Warning 1766 �
+Warning 1771 �
drop procedure test_signal $$
#
# Test SET complex expressions
@@ -1162,17 +1162,17 @@ MYSQL_ERRNO = 10000;
end $$
call test_signal() $$
Warnings:
-Warning 1771 Data truncated for condition item 'CLASS_ORIGIN'
-Warning 1771 Data truncated for condition item 'SUBCLASS_ORIGIN'
-Warning 1771 Data truncated for condition item 'CONSTRAINT_CATALOG'
-Warning 1771 Data truncated for condition item 'CONSTRAINT_SCHEMA'
-Warning 1771 Data truncated for condition item 'CONSTRAINT_NAME'
-Warning 1771 Data truncated for condition item 'CATALOG_NAME'
-Warning 1771 Data truncated for condition item 'SCHEMA_NAME'
-Warning 1771 Data truncated for condition item 'TABLE_NAME'
-Warning 1771 Data truncated for condition item 'COLUMN_NAME'
-Warning 1771 Data truncated for condition item 'CURSOR_NAME'
-Warning 1771 Data truncated for condition item 'MESSAGE_TEXT'
+Warning 1776 Data truncated for condition item 'CLASS_ORIGIN'
+Warning 1776 Data truncated for condition item 'SUBCLASS_ORIGIN'
+Warning 1776 Data truncated for condition item 'CONSTRAINT_CATALOG'
+Warning 1776 Data truncated for condition item 'CONSTRAINT_SCHEMA'
+Warning 1776 Data truncated for condition item 'CONSTRAINT_NAME'
+Warning 1776 Data truncated for condition item 'CATALOG_NAME'
+Warning 1776 Data truncated for condition item 'SCHEMA_NAME'
+Warning 1776 Data truncated for condition item 'TABLE_NAME'
+Warning 1776 Data truncated for condition item 'COLUMN_NAME'
+Warning 1776 Data truncated for condition item 'CURSOR_NAME'
+Warning 1776 Data truncated for condition item 'MESSAGE_TEXT'
Warning 10000 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112222222222222222222288888888
drop procedure test_signal $$
create procedure test_signal()
=== modified file 'mysql-test/r/signal_demo3.result'
--- a/mysql-test/r/signal_demo3.result 2009-02-23 14:53:18 +0000
+++ b/mysql-test/r/signal_demo3.result 2009-03-13 09:43:12 +0000
@@ -78,15 +78,15 @@ ERROR 45000: Oops in proc_1
show warnings;
Level Code Message
Error 1051 Unknown table 'oops_it_is_not_here'
-Error 1768 Oops in proc_9
-Error 1768 Oops in proc_8
-Error 1768 Oops in proc_7
-Error 1768 Oops in proc_6
-Error 1768 Oops in proc_5
-Error 1768 Oops in proc_4
-Error 1768 Oops in proc_3
-Error 1768 Oops in proc_2
-Error 1768 Oops in proc_1
+Error 1773 Oops in proc_9
+Error 1773 Oops in proc_8
+Error 1773 Oops in proc_7
+Error 1773 Oops in proc_6
+Error 1773 Oops in proc_5
+Error 1773 Oops in proc_4
+Error 1773 Oops in proc_3
+Error 1773 Oops in proc_2
+Error 1773 Oops in proc_1
SET @@session.max_error_count = 5;
SELECT @@session.max_error_count;
@@session.max_error_count
@@ -95,11 +95,11 @@ call proc_1();
ERROR 45000: Oops in proc_1
show warnings;
Level Code Message
-Error 1768 Oops in proc_5
-Error 1768 Oops in proc_4
-Error 1768 Oops in proc_3
-Error 1768 Oops in proc_2
-Error 1768 Oops in proc_1
+Error 1773 Oops in proc_5
+Error 1773 Oops in proc_4
+Error 1773 Oops in proc_3
+Error 1773 Oops in proc_2
+Error 1773 Oops in proc_1
SET @@session.max_error_count = 7;
SELECT @@session.max_error_count;
@@session.max_error_count
@@ -108,13 +108,13 @@ call proc_1();
ERROR 45000: Oops in proc_1
show warnings;
Level Code Message
-Error 1768 Oops in proc_7
-Error 1768 Oops in proc_6
-Error 1768 Oops in proc_5
-Error 1768 Oops in proc_4
-Error 1768 Oops in proc_3
-Error 1768 Oops in proc_2
-Error 1768 Oops in proc_1
+Error 1773 Oops in proc_7
+Error 1773 Oops in proc_6
+Error 1773 Oops in proc_5
+Error 1773 Oops in proc_4
+Error 1773 Oops in proc_3
+Error 1773 Oops in proc_2
+Error 1773 Oops in proc_1
SET @@session.max_error_count = 9;
SELECT @@session.max_error_count;
@@session.max_error_count
@@ -123,15 +123,15 @@ call proc_1();
ERROR 45000: Oops in proc_1
show warnings;
Level Code Message
-Error 1768 Oops in proc_9
-Error 1768 Oops in proc_8
-Error 1768 Oops in proc_7
-Error 1768 Oops in proc_6
-Error 1768 Oops in proc_5
-Error 1768 Oops in proc_4
-Error 1768 Oops in proc_3
-Error 1768 Oops in proc_2
-Error 1768 Oops in proc_1
+Error 1773 Oops in proc_9
+Error 1773 Oops in proc_8
+Error 1773 Oops in proc_7
+Error 1773 Oops in proc_6
+Error 1773 Oops in proc_5
+Error 1773 Oops in proc_4
+Error 1773 Oops in proc_3
+Error 1773 Oops in proc_2
+Error 1773 Oops in proc_1
drop database demo;
SET @@global.max_error_count = @start_global_value;
SELECT @@global.max_error_count;
=== modified file 'mysql-test/r/signal_utf32.result'
--- a/mysql-test/r/signal_utf32.result 2009-02-23 14:53:18 +0000
+++ b/mysql-test/r/signal_utf32.result 2009-03-13 09:43:12 +0000
@@ -7,7 +7,7 @@ _utf32 'a';
end $$
call test_signal() $$
Warnings:
-Warning 1766 a
+Warning 1771 a
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -17,7 +17,7 @@ _utf32 X'00000048000000450000004C0000004
end $$
call test_signal() $$
Warnings:
-Warning 1766 HELLO
+Warning 1771 HELLO
drop procedure test_signal $$
create procedure test_signal()
begin
=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result 2009-03-11 21:22:33 +0000
+++ b/mysql-test/r/variables.result 2009-03-12 17:49:01 +0000
@@ -1421,6 +1421,12 @@ SELECT @@global.expire_logs_days;
@@global.expire_logs_days
99
SET GLOBAL expire_logs_days = @old_eld;
+SET GLOBAL auto_increment_offset=-1;
+Warnings:
+Warning 1292 Truncated incorrect auto_increment_offset value: '-1'
+SET GLOBAL auto_increment_offset=0;
+Warnings:
+Warning 1292 Truncated incorrect auto_increment_offset value: '0'
select @@storage_engine;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def @@storage_engine 253 6 6 N 1 31 8
@@ -1433,13 +1439,13 @@ SELECT @@GLOBAL.server_id;
4294967295
SET GLOBAL server_id = (1 << 32);
Warnings:
-Warning 1292 Truncated incorrect server-id value: '4294967296'
+Warning 1292 Truncated incorrect server_id value: '4294967296'
SELECT @@GLOBAL.server_id;
@@GLOBAL.server_id
4294967295
SET GLOBAL server_id = (1 << 60);
Warnings:
-Warning 1292 Truncated incorrect server-id value: '1152921504606846976'
+Warning 1292 Truncated incorrect server_id value: '1152921504606846976'
SELECT @@GLOBAL.server_id;
@@GLOBAL.server_id
4294967295
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2009-02-16 14:47:53 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2009-03-13 09:43:12 +0000
@@ -75,7 +75,7 @@ def mysql event last_executed 10 NULL YE
def mysql event modified 9 0000-00-00 00:00:00 NO timestamp NULL NULL NULL NULL NULL NULL timestamp select,insert,update,references Default Default
def mysql event name 2 NO char 64 256 NULL NULL utf8 utf8_general_ci char(64) PRI select,insert,update,references Default Default
def mysql event on_completion 14 DROP NO enum 8 32 NULL NULL utf8 utf8_general_ci enum('DROP','PRESERVE') select,insert,update,references Default Default
-def mysql event originator 17 NULL NO int NULL NULL 10 0 NULL NULL int(10) select,insert,update,references Default Default
+def mysql event originator 17 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references Default Default
def mysql event sql_mode 15 NO set 478 1912 NULL NULL utf8 utf8_general_ci set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') select,insert,update,references Default Default
def mysql event starts 11 NULL YES datetime NULL NULL NULL NULL NULL NULL datetime select,insert,update,references Default Default
def mysql event status 13 ENABLED NO enum 18 72 NULL NULL utf8 utf8_general_ci enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') select,insert,update,references Default Default
@@ -87,7 +87,7 @@ def mysql func type 4 NULL NO enum 9 36
def mysql general_log argument 6 NULL NO mediumtext 16777215 16777215 NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references Default Default
def mysql general_log command_type 5 NULL NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select,insert,update,references Default Default
def mysql general_log event_time 1 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL NULL NULL timestamp on update CURRENT_TIMESTAMP select,insert,update,references Default Default
-def mysql general_log server_id 4 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references Default Default
+def mysql general_log server_id 4 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references Default Default
def mysql general_log thread_id 3 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references Default Default
def mysql general_log user_host 2 NULL NO mediumtext 16777215 16777215 NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references Default Default
def mysql help_category help_category_id 1 NULL NO smallint NULL NULL 5 0 NULL NULL smallint(5) unsigned PRI select,insert,update,references Default Default
@@ -180,7 +180,7 @@ def mysql slow_log lock_time 4 NULL NO t
def mysql slow_log query_time 3 NULL NO time NULL NULL NULL NULL NULL NULL time select,insert,update,references Default Default
def mysql slow_log rows_examined 6 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references Default Default
def mysql slow_log rows_sent 5 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references Default Default
-def mysql slow_log server_id 10 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references Default Default
+def mysql slow_log server_id 10 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references Default Default
def mysql slow_log sql_text 11 NULL NO mediumtext 16777215 16777215 NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references Default Default
def mysql slow_log start_time 1 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL NULL NULL timestamp on update CURRENT_TIMESTAMP select,insert,update,references Default Default
def mysql slow_log user_host 2 NULL NO mediumtext 16777215 16777215 NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references Default Default
@@ -387,7 +387,7 @@ NULL mysql event ends datetime NULL NULL
4.0000 mysql event on_completion enum 8 32 utf8 utf8_general_ci enum('DROP','PRESERVE')
4.0000 mysql event sql_mode set 478 1912 utf8 utf8_general_ci set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH')
4.0000 mysql event comment char 64 256 utf8 utf8_bin char(64)
-NULL mysql event originator int NULL NULL NULL NULL int(10)
+NULL mysql event originator int NULL NULL NULL NULL int(10) unsigned
1.0000 mysql event time_zone char 64 64 latin1 latin1_swedish_ci char(64)
4.0000 mysql event character_set_client char 32 128 utf8 utf8_bin char(32)
4.0000 mysql event collation_connection char 32 128 utf8 utf8_bin char(32)
@@ -400,7 +400,7 @@ NULL mysql func ret tinyint NULL NULL NU
NULL mysql general_log event_time timestamp NULL NULL NULL NULL timestamp
1.0000 mysql general_log user_host mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext
NULL mysql general_log thread_id int NULL NULL NULL NULL int(11)
-NULL mysql general_log server_id int NULL NULL NULL NULL int(11)
+NULL mysql general_log server_id int NULL NULL NULL NULL int(10) unsigned
4.0000 mysql general_log command_type varchar 64 256 utf8 utf8_general_ci varchar(64)
1.0000 mysql general_log argument mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext
NULL mysql help_category help_category_id smallint NULL NULL NULL NULL smallint(5) unsigned
@@ -495,7 +495,7 @@ NULL mysql slow_log rows_examined int NU
4.0000 mysql slow_log db varchar 512 2048 utf8 utf8_general_ci varchar(512)
NULL mysql slow_log last_insert_id int NULL NULL NULL NULL int(11)
NULL mysql slow_log insert_id int NULL NULL NULL NULL int(11)
-NULL mysql slow_log server_id int NULL NULL NULL NULL int(11)
+NULL mysql slow_log server_id int NULL NULL NULL NULL int(10) unsigned
1.0000 mysql slow_log sql_text mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext
4.0000 mysql tables_priv Host char 60 240 utf8 utf8_bin char(60)
4.0000 mysql tables_priv Db char 64 256 utf8 utf8_bin char(64)
=== modified file 'mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result'
--- a/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result 2009-02-27 20:43:43 +0000
+++ b/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result 2009-03-12 16:55:10 +0000
@@ -55,7 +55,7 @@ SELECT @@session.auto_increment_incremen
'#------------------FN_DYNVARS_001_05-----------------------#'
SET @@global.auto_increment_increment = 0;
Warnings:
-Warning 1292 Truncated incorrect auto-increment-increment value: '0'
+Warning 1292 Truncated incorrect auto_increment_increment value: '0'
SELECT @@global.auto_increment_increment;
@@global.auto_increment_increment
1
@@ -83,7 +83,7 @@ SELECT @@global.auto_increment_increment
65535
SET @@session.auto_increment_increment = 0;
Warnings:
-Warning 1292 Truncated incorrect auto-increment-increment value: '0'
+Warning 1292 Truncated incorrect auto_increment_increment value: '0'
SELECT @@session.auto_increment_increment;
@@session.auto_increment_increment
1
@@ -126,7 +126,7 @@ SELECT @@global.auto_increment_increment
1
SET @@global.auto_increment_increment = FALSE;
Warnings:
-Warning 1292 Truncated incorrect auto-increment-increment value: '0'
+Warning 1292 Truncated incorrect auto_increment_increment value: '0'
SELECT @@global.auto_increment_increment;
@@global.auto_increment_increment
1
=== modified file 'mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result'
--- a/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result 2009-02-27 20:43:43 +0000
+++ b/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result 2009-03-12 16:55:10 +0000
@@ -55,7 +55,7 @@ SELECT @@session.auto_increment_offset;
'#------------------FN_DYNVARS_002_05-----------------------#'
SET @@global.auto_increment_offset = 0;
Warnings:
-Warning 1292 Truncated incorrect auto-increment-offset value: '0'
+Warning 1292 Truncated incorrect auto_increment_offset value: '0'
SELECT @@global.auto_increment_offset;
@@global.auto_increment_offset
1
@@ -88,7 +88,7 @@ SELECT @@global.auto_increment_offset;
65535
SET @@session.auto_increment_offset = 0;
Warnings:
-Warning 1292 Truncated incorrect auto-increment-offset value: '0'
+Warning 1292 Truncated incorrect auto_increment_offset value: '0'
SELECT @@session.auto_increment_offset;
@@session.auto_increment_offset
1
@@ -139,7 +139,7 @@ SELECT @@global.auto_increment_offset;
1
SET @@global.auto_increment_offset = FALSE;
Warnings:
-Warning 1292 Truncated incorrect auto-increment-offset value: '0'
+Warning 1292 Truncated incorrect auto_increment_offset value: '0'
SELECT @@global.auto_increment_offset;
@@global.auto_increment_offset
1
=== modified file 'mysql-test/suite/sys_vars/r/concurrent_insert_basic.result'
--- a/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result 2009-02-27 20:43:43 +0000
+++ b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result 2009-03-12 16:55:10 +0000
@@ -35,7 +35,7 @@ Select @@global.concurrent_insert;
0
SET @@global.concurrent_insert = 100;
Warnings:
-Warning 1292 Truncated incorrect concurrent-insert value: '100'
+Warning 1292 Truncated incorrect concurrent_insert value: '100'
Select @@global.concurrent_insert;
@@global.concurrent_insert
2
=== modified file 'mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result 2009-03-12 17:49:01 +0000
@@ -23,13 +23,13 @@ SELECT @@global.rpl_recovery_rank;
123456789
SET @@global.rpl_recovery_rank = 2147483648*2;
Warnings:
-Warning 1292 Truncated incorrect rpl-recovery-rank value: '4294967296'
+Warning 1292 Truncated incorrect rpl_recovery_rank value: '4294967296'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
4294967295
SET @@global.rpl_recovery_rank = 2147483648*1024;
Warnings:
-Warning 1292 Truncated incorrect rpl-recovery-rank value: '2199023255552'
+Warning 1292 Truncated incorrect rpl_recovery_rank value: '2199023255552'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
4294967295
@@ -38,7 +38,7 @@ SELECT @@global.rpl_recovery_rank;
4294967295
SET @@global.rpl_recovery_rank = 2147483648*2147483648;
Warnings:
-Warning 1292 Truncated incorrect rpl-recovery-rank value: '4611686018427387904'
+Warning 1292 Truncated incorrect rpl_recovery_rank value: '4611686018427387904'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
4294967295
=== modified file 'mysql-test/suite/sys_vars/r/server_id_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/server_id_basic_32.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/server_id_basic_32.result 2009-03-12 17:49:01 +0000
@@ -61,7 +61,7 @@ SELECT @@global.server_id;
0
SET @@global.server_id = 2147483649*2;
Warnings:
-Warning 1292 Truncated incorrect server-id value: '4294967298'
+Warning 1292 Truncated incorrect server_id value: '4294967298'
SELECT @@global.server_id;
@@global.server_id
4294967295
=== modified file 'mysql-test/suite/sys_vars/r/server_id_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/server_id_basic_64.result 2009-03-11 21:22:33 +0000
+++ b/mysql-test/suite/sys_vars/r/server_id_basic_64.result 2009-03-12 17:49:01 +0000
@@ -52,16 +52,20 @@ SET @@local.server_id = 4;
ERROR HY000: Variable 'server_id' is a GLOBAL variable and should be set with SET GLOBAL
'#------------------FN_DYNVARS_144_05-----------------------#'
SET @@global.server_id = -1;
+Warnings:
+Warning 1292 Truncated incorrect server_id value: '-1'
SELECT @@global.server_id;
@@global.server_id
0
SET @@global.server_id = -2147483648;
+Warnings:
+Warning 1292 Truncated incorrect server_id value: '-2147483648'
SELECT @@global.server_id;
@@global.server_id
0
SET @@global.server_id = 2147483649*2;
Warnings:
-Warning 1292 Truncated incorrect server-id value: '4294967298'
+Warning 1292 Truncated incorrect server_id value: '4294967298'
SELECT @@global.server_id;
@@global.server_id
4294967295
=== modified file 'mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result 2009-03-12 17:49:01 +0000
@@ -67,7 +67,7 @@ SELECT @@global.transaction_alloc_block_
1024
SET @@global.transaction_alloc_block_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect transaction_alloc_block_size value: '0'
+Warning 1292 Truncated incorrect transaction_alloc_block_size value: '-1024'
SELECT @@global.transaction_alloc_block_size;
@@global.transaction_alloc_block_size
1024
=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test 2009-02-19 17:36:09 +0000
+++ b/mysql-test/t/mysqldump.test 2009-03-12 16:18:40 +0000
@@ -1647,6 +1647,22 @@ DROP TABLE t1,t2;
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
--exec $MYSQL_DUMP test
+# We reset concurrent_inserts value to whatever it was at the start of the test
+SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
+
+--echo #
+--echo # Bug #42635: mysqldump includes views that were excluded using
+--echo # the --ignore-table option
+--echo #
+
+create database db42635;
+use db42635;
+create table t1 (id int);
+create view db42635.v1 (c) as select * from db42635.t1;
+create view db42635.v2 (c) as select * from db42635.t1;
+--exec $MYSQL_DUMP --skip-comments --ignore-table=db42635.v1 db42635
+use test;
+drop database db42635;
--echo #
--echo # Bug#33550 mysqldump 4.0 compatibility broken
=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test 2009-03-11 21:22:33 +0000
+++ b/mysql-test/t/variables.test 2009-03-12 17:49:01 +0000
@@ -1159,6 +1159,11 @@ SELECT @@global.expire_logs_days;
# cleanup
SET GLOBAL expire_logs_days = @old_eld;
+# show that warning uses underscore (sysvar-name), not hyphens (option-name)
+SET GLOBAL auto_increment_offset=-1;
+SET GLOBAL auto_increment_offset=0;
+
+
#
# Bug#41030 Wrong meta data (incorrect fieldlen)
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h 2009-03-09 12:17:41 +0000
+++ b/sql/mysql_priv.h 2009-03-13 09:42:54 +0000
@@ -2104,6 +2104,9 @@ extern SHOW_COMP_OPTION have_geometry, h
extern SHOW_COMP_OPTION have_crypt;
extern SHOW_COMP_OPTION have_compress;
+extern int orig_argc;
+extern char **orig_argv;
+extern const char *load_default_groups[];
#ifndef __WIN__
extern pthread_t signal_thread;
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2009-03-11 21:22:33 +0000
+++ b/sql/mysqld.cc 2009-03-13 10:28:07 +0000
@@ -750,6 +750,9 @@ static int defaults_argc;
static char **defaults_argv;
static char *opt_bin_logname;
+int orig_argc;
+char **orig_argv;
+
static my_socket unix_sock,ip_sock;
struct my_rnd_struct sql_rand; ///< used by sql_class.cc:THD::THD()
@@ -3078,18 +3081,16 @@ pthread_handler_t handle_shutdown(void *
}
#endif
-#if !defined(EMBEDDED_LIBRARY)
-static const char *load_default_groups[]= {
+const char *load_default_groups[]= {
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
"mysql_cluster",
#endif
"mysqld","server", MYSQL_BASE_VERSION, 0, 0};
-#if defined(__WIN__)
+#if defined(__WIN__) && !defined(EMBEDDED_LIBRARY)
static const int load_default_groups_sz=
sizeof(load_default_groups)/sizeof(load_default_groups[0]);
#endif
-#endif /*!EMBEDDED_LIBRARY*/
/**
@@ -3380,6 +3381,8 @@ static int init_common_variables(const c
SQLCOM_END + 8);
#endif
+ orig_argc=argc;
+ orig_argv=argv;
load_defaults(conf_file_name, groups, &argc, &argv);
defaults_argv=argv;
defaults_argc=argc;
@@ -4114,6 +4117,7 @@ server.");
if ((ho_error= handle_options(&defaults_argc, &tmp_argv, no_opts,
mysqld_get_one_option)))
unireg_abort(ho_error);
+ my_getopt_skip_unknown= TRUE;
if (defaults_argc)
{
=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc 2009-03-09 12:49:47 +0000
+++ b/sql/set_var.cc 2009-03-12 17:00:27 +0000
@@ -1624,9 +1624,10 @@ static bool get_unsigned(THD *thd, set_v
var->save_result.ulonglong_value= getopt_ull_limit_value(var->save_result.
ulonglong_value,
- limits, &fixed);
+ limits, &fixed);
- if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE, limits->name,
+ if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE,
+ var->var->name,
(longlong) unadjusted))
return TRUE;
}
=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc 2009-03-02 21:18:26 +0000
+++ b/sql/sql_plugin.cc 2009-03-13 09:42:54 +0000
@@ -1144,8 +1144,9 @@ int plugin_init(int *argc, char **argv,
for (plugin= *builtins; plugin->info; plugin++)
{
if (opt_ignore_builtin_innodb &&
- !my_strcasecmp(&my_charset_latin1, plugin->name, "InnoDB"))
- continue;
+ !my_strnncoll(&my_charset_latin1, (const uchar*) plugin->name,
+ 6, (const uchar*) "InnoDB", 6))
+ continue;
/* by default, ndbcluster and federated are disabled */
def_enabled=
my_strcasecmp(&my_charset_latin1, plugin->name, "NDBCLUSTER") != 0 &&
@@ -1633,8 +1634,8 @@ bool mysql_install_plugin(THD *thd, cons
{
TABLE_LIST tables;
TABLE *table;
- int error, argc;
- char *argv[2];
+ int error, argc=orig_argc;
+ char **argv=orig_argv;
struct st_plugin_int *tmp;
DBUG_ENTER("mysql_install_plugin");
@@ -1652,21 +1653,31 @@ bool mysql_install_plugin(THD *thd, cons
pthread_mutex_lock(&LOCK_plugin);
rw_wrlock(&LOCK_system_variables_hash);
- /* handle_options() assumes arg0 (program name) always exists */
- argv[0]= const_cast<char*>(""); // without a cast gcc emits a warning
- argv[1]= 0;
- argc= 1;
+
+ load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv);
error= plugin_add(thd->mem_root, name, dl, &argc, argv, REPORT_TO_USER);
+ if (argv)
+ free_defaults(argv);
rw_unlock(&LOCK_system_variables_hash);
if (error || !(tmp= plugin_find_internal(name, MYSQL_ANY_PLUGIN)))
goto err;
- if (plugin_initialize(tmp))
+ if (tmp->state == PLUGIN_IS_DISABLED)
{
- my_error(ER_CANT_INITIALIZE_UDF, MYF(0), name->str,
- "Plugin initialization function failed.");
- goto deinit;
+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+ ER_CANT_INITIALIZE_UDF, ER(ER_CANT_INITIALIZE_UDF),
+ name->str, "Plugin is disabled");
+ }
+ else
+ {
+ DBUG_ASSERT(tmp->state == PLUGIN_IS_UNINITIALIZED);
+ if (plugin_initialize(tmp))
+ {
+ my_error(ER_CANT_INITIALIZE_UDF, MYF(0), name->str,
+ "Plugin initialization function failed.");
+ goto deinit;
+ }
}
/*
=== modified file 'storage/falcon/plug.in'
--- a/storage/falcon/plug.in 2009-01-09 11:46:26 +0000
+++ b/storage/falcon/plug.in 2009-03-13 13:18:32 +0000
@@ -73,7 +73,6 @@ fi
# Generate Makefile for TransformLib.
MYSQL_PLUGIN_ACTIONS(falcon,[
- AC_CONFIG_FILES(storage/falcon/TransformLib/Makefile)
AC_LANG_PUSH([C++])
ac_save_CXXFLAGS="$CXXFLAGS"
=== modified file 'storage/maria/plug.in'
--- a/storage/maria/plug.in 2009-01-09 11:46:26 +0000
+++ b/storage/maria/plug.in 2009-03-13 13:18:32 +0000
@@ -6,7 +6,6 @@ MYSQL_PLUGIN_STATIC(maria, [libmaria
MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(maria, [ha_maria.cc])
MYSQL_PLUGIN_ACTIONS(maria, [
-AC_CONFIG_FILES(storage/maria/unittest/Makefile)
AC_ARG_WITH(maria-tmp-tables,
AS_HELP_STRING([--with-maria-tmp-tables],[Use Maria for internal temporary tables]),
[with_maria_tmp_tables=$withval],
Attachment: [text/bzr-bundle] bzr/kristofer.pettersson@sun.com-20090313144057-t1kdze1sh8mqfhbm.bundle
| Thread |
|---|
| • bzr commit into mysql-6.0-bugteam branch (kristofer.pettersson:3112) | Kristofer Pettersson | 13 Mar |
