| List: | Commits | « Previous MessageNext Message » | |
| From: | Chad MILLER | Date: | January 7 2007 3:31pm |
| Subject: | bk commit into 5.1 tree (cmiller:1.2379) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of cmiller. When cmiller does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-01-07 09:31:49-05:00, cmiller@stripped +26 -0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener MERGE: 1.2367.1.5 Makefile.am@stripped, 2007-01-07 09:27:59-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.106.1.2 configure.in@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.404.1.3 include/mysql.h@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.170.1.6 mysql-test/Makefile.am@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.91.1.5 mysql-test/lib/mtr_cases.pl@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.50.1.1 mysql-test/lib/mtr_process.pl@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.64.1.1 mysql-test/mysql-test-run.pl@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.254.1.3 mysql-test/r/myisam.result@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.98.1.4 mysql-test/r/view.result@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.193.1.1 mysql-test/r/warnings.result@stripped, 2007-01-07 09:31:46-05:00, cmiller@stripped +0 -2 Manual merge. MERGE: 1.55.1.1 mysql-test/t/myisam.test@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.71.1.4 mysql-test/t/warnings.test@stripped, 2007-01-07 09:31:46-05:00, cmiller@stripped +0 -2 Manual merge. MERGE: 1.29.1.2 scripts/make_binary_distribution.sh@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.135.1.2 scripts/mysqlbug.sh@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.7.1.1 server-tools/instance-manager/Makefile.am@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.43.1.2 sql/event_queue.cc@stripped, 2007-01-07 09:28:00-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.19.1.1 sql/field.cc@stripped, 2007-01-07 09:28:01-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.362.1.1 sql/field.h@stripped, 2007-01-07 09:28:01-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.199.1.1 sql/item_sum.h@stripped, 2007-01-07 09:28:01-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.111.1.1 sql/opt_range.cc@stripped, 2007-01-07 09:28:01-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.254.1.1 sql/sql_class.h@stripped, 2007-01-07 09:28:01-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.331.1.6 sql/sql_parse.cc@stripped, 2007-01-07 09:28:02-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.614.1.1 sql/sql_plugin.cc@stripped, 2007-01-07 09:28:02-05:00, cmiller@stripped +0 -1 Auto merged MERGE: 1.36.4.2 sql/sql_show.cc@stripped, 2007-01-07 09:28:02-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.381.1.1 storage/federated/ha_federated.cc@stripped, 2007-01-07 09:28:02-05:00, cmiller@stripped +0 -0 Auto merged MERGE: 1.90.1.4 strings/ctype-extra.c@stripped, 2007-01-07 09:31:46-05:00, cmiller@stripped +0 -15 Manual merge. MERGE: 1.25.1.1 # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: cmiller # Host: zippy.cornsilk.net # Root: /home/cmiller/work/mysql/mysql-5.1-maint-greener/RESYNC --- 1.108/Makefile.am 2007-01-07 09:31:55 -05:00 +++ 1.109/Makefile.am 2007-01-07 09:31:55 -05:00 @@ -1,4 +1,4 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# Copyright (C) 2000-2006 MySQL AB # # 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 @@ -161,4 +161,3 @@ test-force-full-pl: test-force-full # Don't update the files from bitkeeper %::SCCS/s.% - --- 1.173/include/mysql.h 2007-01-07 09:31:55 -05:00 +++ 1.174/include/mysql.h 2007-01-07 09:31:55 -05:00 @@ -64,9 +64,9 @@ typedef int my_socket; #endif /* my_socket_defined */ #endif /* _global_h */ +#include "mysql_version.h" #include "mysql_com.h" #include "mysql_time.h" -#include "mysql_version.h" #include "typelib.h" #include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */ --- 1.138/scripts/make_binary_distribution.sh 2007-01-07 09:31:55 -05:00 +++ 1.139/scripts/make_binary_distribution.sh 2007-01-07 09:31:55 -05:00 @@ -1,4 +1,18 @@ #!/bin/sh +# Copyright (C) 2000-2006 MySQL AB +# +# 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 +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # This is a script to create a TAR or ZIP binary distribution out of a # built source tree. The output file will be put at the top level of --- 1.8/scripts/mysqlbug.sh 2007-01-07 09:31:55 -05:00 +++ 1.9/scripts/mysqlbug.sh 2007-01-07 09:31:55 -05:00 @@ -1,4 +1,19 @@ #!/bin/sh +# Copyright (C) 2000-2002, 2004 MySQL AB +# +# 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 +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # Create a bug report and mail it to the mysql mailing list # Based on glibc bug reporting script. --- 1.363/sql/field.cc 2007-01-07 09:31:55 -05:00 +++ 1.364/sql/field.cc 2007-01-07 09:31:55 -05:00 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2006 MySQL AB 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 --- 1.200/sql/field.h 2007-01-07 09:31:55 -05:00 +++ 1.201/sql/field.h 2007-01-07 09:31:55 -05:00 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2006 MySQL AB 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 --- 1.112/sql/item_sum.h 2007-01-07 09:31:55 -05:00 +++ 1.113/sql/item_sum.h 2007-01-07 09:31:55 -05:00 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2006 MySQL AB 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 --- 1.256/sql/opt_range.cc 2007-01-07 09:31:56 -05:00 +++ 1.257/sql/opt_range.cc 2007-01-07 09:31:56 -05:00 @@ -5017,6 +5017,7 @@ static SEL_TREE *get_func_mm_tree(RANGE_ { SEL_ARG *new_interval, *last_val; if (((new_interval= tree2->keys[idx])) && + (tree->keys[idx]) && ((last_val= tree->keys[idx]->last()))) { new_interval->min_value= last_val->max_value; --- 1.616/sql/sql_parse.cc 2007-01-07 09:31:56 -05:00 +++ 1.617/sql/sql_parse.cc 2007-01-07 09:31:56 -05:00 @@ -2954,6 +2954,12 @@ mysql_execute_command(THD *thd) goto end_with_restore_list; #ifndef HAVE_READLINK + if (lex->create_info.data_file_name) + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, + "DATA DIRECTORY option ignored"); + if (lex->create_info.index_file_name) + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, + "INDEX DIRECTORY option ignored"); lex->create_info.data_file_name=lex->create_info.index_file_name=0; #else /* Fix names if symlinked tables */ --- 1.382/sql/sql_show.cc 2007-01-07 09:31:56 -05:00 +++ 1.383/sql/sql_show.cc 2007-01-07 09:31:56 -05:00 @@ -1266,7 +1266,7 @@ int store_create_info(THD *thd, TABLE_LI to the CREATE TABLE statement */ - if ((for_str= file->get_tablespace_name(thd))) + if ((for_str= file->get_tablespace_name(thd,0,0))) { packet->append(STRING_WITH_LEN(" /*!50100 TABLESPACE ")); packet->append(for_str, strlen(for_str)); @@ -3973,7 +3973,7 @@ static void store_schema_partitions_reco strlen(part_elem->tablespace_name), cs); else { - char *ts= showing_table->file->get_tablespace_name(thd); + char *ts= showing_table->file->get_tablespace_name(thd,0,0); if(ts) { table->field[24]->store(ts, strlen(ts), cs); --- 1.23/sql/event_queue.cc 2007-01-07 09:31:56 -05:00 +++ 1.24/sql/event_queue.cc 2007-01-07 09:31:56 -05:00 @@ -2,8 +2,7 @@ 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of --- 1.194/mysql-test/r/view.result 2007-01-07 09:31:56 -05:00 +++ 1.195/mysql-test/r/view.result 2007-01-07 09:31:56 -05:00 @@ -2675,9 +2675,9 @@ lName varchar(25) NOT NULL, DOB date NOT NULL, uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY); INSERT INTO t1(fName, lName, DOB) VALUES -('Hank', 'Hill', '1964-09-29'), -('Tom', 'Adams', '1908-02-14'), -('Homer', 'Simpson', '1968-03-05'); +('Alice', 'Hill', date_sub(curdate(), interval 15271 day)), +('Bob', 'Adams', date_sub(curdate(), interval 33600 day)), +('Carol', 'Simpson', date_sub(curdate(), interval 13700 day)); CREATE VIEW v1 AS SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75; --- 1.51/mysql-test/lib/mtr_cases.pl 2007-01-07 09:31:56 -05:00 +++ 1.52/mysql-test/lib/mtr_cases.pl 2007-01-07 09:31:56 -05:00 @@ -1,4 +1,18 @@ # -*- cperl -*- +# Copyright (C) 2005-2006 MySQL AB +# +# 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 +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the --- 1.65/mysql-test/lib/mtr_process.pl 2007-01-07 09:31:56 -05:00 +++ 1.66/mysql-test/lib/mtr_process.pl 2007-01-07 09:31:56 -05:00 @@ -1,4 +1,18 @@ # -*- cperl -*- +# Copyright (C) 2004-2006 MySQL AB +# +# 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 +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the --- 1.45/server-tools/instance-manager/Makefile.am 2007-01-07 09:31:56 -05:00 +++ 1.46/server-tools/instance-manager/Makefile.am 2007-01-07 09:31:56 -05:00 @@ -60,7 +60,7 @@ client_settings.h: libexec_PROGRAMS= mysqlmanager -mysqlmanager_CXXFLAGS= -Wall -W +mysqlmanager_CXXFLAGS= mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ manager.h manager.cc log.h log.cc \ --- 1.30/mysql-test/t/warnings.test 2007-01-07 09:31:56 -05:00 +++ 1.31/mysql-test/t/warnings.test 2007-01-07 09:31:56 -05:00 @@ -144,8 +144,6 @@ drop table t1; # Bug#20778: strange characters in warning message 1366 when called in SP # -let $engine_type= innodb; - CREATE TABLE t1( f1 CHAR(20) ); CREATE TABLE t2( f1 CHAR(20), f2 CHAR(25) ); CREATE TABLE t3( f1 CHAR(20), f2 CHAR(25), f3 DATE ); --- 1.99/mysql-test/r/myisam.result 2007-01-07 09:31:56 -05:00 +++ 1.100/mysql-test/r/myisam.result 2007-01-07 09:31:56 -05:00 @@ -922,6 +922,7 @@ SET @@myisam_repair_threads=1; SHOW VARIABLES LIKE 'myisam_repair%'; Variable_name Value myisam_repair_threads 1 +End of 4.1 tests set storage_engine=MyISAM; drop table if exists t1,t2,t3; --- Testing varchar --- @@ -1590,20 +1591,6 @@ show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 1 a 1 a A 8 NULL NULL YES BTREE drop table t1; -show create table t1; -show create table t1; -create table t1 (a int) engine=myisam select 42 a; -select * from t1; -a -9 -select * from t1; -a -99 -select * from t1; -a -42 -drop table t1; -End of 4.1 tests create table t1 (c1 int) engine=myisam pack_keys=0; create table t2 (c1 int) engine=myisam pack_keys=1; create table t3 (c1 int) engine=myisam pack_keys=default; --- 1.73/mysql-test/t/myisam.test 2007-01-07 09:31:56 -05:00 +++ 1.74/mysql-test/t/myisam.test 2007-01-07 09:31:56 -05:00 @@ -846,6 +846,10 @@ DROP TABLE t1; # SET @@myisam_repair_threads=1; SHOW VARIABLES LIKE 'myisam_repair%'; + +--echo End of 4.1 tests + + # Test varchar # @@ -942,42 +946,7 @@ alter table t1 enable keys; show keys from t1; drop table t1; -# -# Bug#8706 - temporary table with data directory option fails -# -connect (session1,localhost,root,,); -connect (session2,localhost,root,,); - -connection session1; -disable_query_log; -eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/tmp" select 9 a; -enable_query_log; -disable_result_log; -show create table t1; -enable_result_log; - -connection session2; -disable_query_log; -eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/tmp" select 99 a; -enable_query_log; -disable_result_log; -show create table t1; -enable_result_log; -connection default; -create table t1 (a int) engine=myisam select 42 a; - -connection session1; -select * from t1; -disconnect session1; -connection session2; -select * from t1; -disconnect session2; -connection default; -select * from t1; -drop table t1; - ---echo End of 4.1 tests # # Bug#10056 - PACK_KEYS option take values greater than 1 while creating table --- 1.94/storage/federated/ha_federated.cc 2007-01-07 09:31:56 -05:00 +++ 1.95/storage/federated/ha_federated.cc 2007-01-07 09:31:56 -05:00 @@ -2955,7 +2955,7 @@ static int federated_commit(handlerton * if (old) old->trx_next= NULL; error= ptr->connection_commit(); - if (error && !return_val); + if (error && !return_val) return_val= error; } thd->ha_data[hton->slot]= NULL; --- 1.96/mysql-test/Makefile.am 2007-01-07 09:31:56 -05:00 +++ 1.97/mysql-test/Makefile.am 2007-01-07 09:31:56 -05:00 @@ -1,4 +1,4 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# Copyright (C) 2000-2006 MySQL AB # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (cmiller:1.2379) | Chad MILLER | 7 Jan |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.490 sec. using MySQL 5.1.14-beta-log