List:Commits« Previous MessageNext Message »
From:Tatiana Azundris Nurnberg Date:February 22 2011 5:37am
Subject:bzr commit into mysql-trunk branch (azundris:3695)
View as plain text  
#At file:///Users/tnurnberg/forest/trunk/ based on revid:azundris@stripped

 3695 Tatiana Azundris Nurnberg	2011-02-22
      post merge cross platform fixes

    modified:
      mysql-test/include/mysqld--help.inc
      mysql-test/r/log_tables.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
      mysql-test/t/log_tables.test
=== modified file 'mysql-test/include/mysqld--help.inc'
--- a/mysql-test/include/mysqld--help.inc	2011-02-10 08:00:23 +0000
+++ b/mysql-test/include/mysqld--help.inc	2011-02-22 05:37:44 +0000
@@ -8,7 +8,7 @@
 # force symbolic-links=0 (valgrind build has a different default)
 #
 
-exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help --verbose > $MYSQL_TMP_DIR/mysqld--help.txt 2>$MYSQL_TMP_DIR/mysqld--help2.txt;
+exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help --verbose > $MYSQL_TMP_DIR/mysqld--help.txt 2>/dev/null;
 
 # The inline perl code below will copy $MYSQL_TMP_DIR/mysqld--help.txt
 # to output, but filter away some variable stuff (e.g. paths).
@@ -22,7 +22,7 @@ perl;
 
   # Plugins which may or may not be there:
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster debug temp-pool ssl des-key-file
-              thread-concurrency super-large-pages mutex-deadlock-detector null-audit falcon/;
+              thread-concurrency super-large-pages mutex-deadlock-detector null-audit/;
 
   # And substitute the content some environment variables with their
   # names:
@@ -33,7 +33,6 @@ perl;
   $skip=0;
   open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die;
   while (<F>) {
-    if(/^Usage: (.*) \[OPTIONS\]$/) { $mysqld=$1; }
     next if 1../The following groups are read/;
     # formatting, skip line consisting entirely of dashes and blanks
     next if /^[\- ]+\s?$/;
@@ -54,17 +53,5 @@ perl;
     print;
   }
   close F;
-
-  print "\nstderr:\n";
-  open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help2.txt") or die;
-  while (<F>) {
-    s/$mysqld/MYSQLD/;
-    s/^\d+\s+\d+:\d\d:\d\d\s+(\[\w+?\]\s+.*)$/$1/; # remove timestamp
-    # skip engines that may or may not be there. print anything else.
-    next if /\'($re2)\'/i;
-    next if /unknown option \'--loose-skip-($re2)\'/;
-    print;
-  }
-  close F;
 EOF
 

=== modified file 'mysql-test/r/log_tables.result'
--- a/mysql-test/r/log_tables.result	2011-02-10 11:13:41 +0000
+++ b/mysql-test/r/log_tables.result	2011-02-22 05:37:44 +0000
@@ -469,7 +469,8 @@ CREATE TABLE `db_17876.slow_log_data` (
 `last_insert_id` int(11) default NULL,
 `insert_id` int(11) default NULL,
 `server_id` int(11) default NULL,
-`sql_text` mediumtext 
+`sql_text` mediumtext,
+`thread_id` int(11) default NULL
 );
 CREATE TABLE `db_17876.general_log_data` (
 `event_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2011-02-22 02:58:40 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2011-02-22 05:37:44 +0000
@@ -977,8 +977,3 @@ wait-timeout 28800
 
 To see what values a running MySQL server is using, type
 'mysqladmin variables' instead of 'mysqld --verbose --help'.
-
-stderr:
-[Note] Binlog end
-[Note] Shutting down plugin 'CSV'
-[Note] Shutting down plugin 'MyISAM'

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2011-02-22 02:58:40 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2011-02-22 05:37:44 +0000
@@ -983,8 +983,3 @@ wait-timeout 28800
 
 To see what values a running MySQL server is using, type
 'mysqladmin variables' instead of 'mysqld --verbose --help'.
-
-stderr:
-[Note] Binlog end
-[Note] Shutting down plugin 'CSV'
-[Note] Shutting down plugin 'MyISAM'

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2010-12-17 11:28:59 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2011-02-22 05:37:44 +0000
@@ -188,6 +188,7 @@ def	mysql	slow_log	rows_sent	5	NULL	NO	i
 def	mysql	slow_log	server_id	10	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
 def	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 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	
+def	mysql	slow_log	thread_id	12	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 def	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 def	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
@@ -511,6 +512,7 @@ NULL	mysql	slow_log	last_insert_id	int	N
 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(10) unsigned
 1.0000	mysql	slow_log	sql_text	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	slow_log	thread_id	int	NULL	NULL	NULL	NULL	int(11)
 3.0000	mysql	tables_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	tables_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	User	char	16	48	utf8	utf8_bin	char(16)

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2010-12-09 16:17:13 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2011-02-22 05:37:44 +0000
@@ -31,7 +31,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -67,7 +67,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -101,7 +101,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -135,7 +135,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -169,7 +169,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2010-12-09 16:17:13 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2011-02-22 05:37:44 +0000
@@ -31,7 +31,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -67,7 +67,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -101,7 +101,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -135,7 +135,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -169,7 +169,7 @@ ERROR 1050 (42S01) at line 341: Table 't
 ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
 ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 902: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/t/log_tables.test'
--- a/mysql-test/t/log_tables.test	2011-02-10 11:13:41 +0000
+++ b/mysql-test/t/log_tables.test	2011-02-22 05:37:44 +0000
@@ -657,7 +657,8 @@ CREATE TABLE `db_17876.slow_log_data` (
   `last_insert_id` int(11) default NULL,
   `insert_id` int(11) default NULL,
   `server_id` int(11) default NULL,
-  `sql_text` mediumtext 
+  `sql_text` mediumtext,
+  `thread_id` int(11) default NULL
 );
 
 CREATE TABLE `db_17876.general_log_data` (


Attachment: [text/bzr-bundle] bzr/azundris@sun.com-20110222053744-xav70yu3pzt5dzsd.bundle
Thread
bzr commit into mysql-trunk branch (azundris:3695) Tatiana Azundris Nurnberg22 Feb