From f6ddcc6d4b8dbfb701ce056d404469209f2916e6 Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Tue, 10 Feb 2009 01:00:11 -0200 Subject: [PATCH 1/3] Post-merge fix: Complete reversal of bug 33699. mysql-test/t/null.test: Revert fix for bug 33699. --- mysql-test/t/null.test | 2 -- 1 file changed, 2 deletions(-) diff --git a/mysql-test/t/null.test b/mysql-test/t/null.test index ddf6b8870fa..2878b54c357 100644 --- a/mysql-test/t/null.test +++ b/mysql-test/t/null.test @@ -61,9 +61,7 @@ drop table t1; # CREATE TABLE t1 (a varchar(16) NOT NULL default '', b smallint(6) NOT NULL default 0, c datetime NOT NULL default '0000-00-00 00:00:00', d smallint(6) NOT NULL default 0); INSERT INTO t1 SET a = "", d= "2003-01-14 03:54:55"; ---error 1048 UPDATE t1 SET d=1/NULL; ---error 1048 UPDATE t1 SET d=NULL; --error 1048 INSERT INTO t1 (a) values (null); From a328926b1cf92f60e07cc92d7d9b83ec19369638 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Wed, 11 Feb 2009 12:04:40 +0200 Subject: [PATCH 2/3] changed the tree id pending a merge of 5.0-bugteam -> 5.0-main --- .bzr-mysql/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index 557df1b1ffe..f79c1cd6319 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com" -tree_name = "mysql-5.0-bugteam" +tree_name = "mysql-5.0" From 6bd93f670271eaf2bd79bd7fa538e9baaa7dcb0f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 11 Feb 2009 14:58:50 +0100 Subject: [PATCH 3/3] Raise version number after cloning 5.1.32 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index b5beb7a24f5..bdeb0f24c40 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM # # When changing major version number please also check switch statement # in mysqlbinlog::check_master_version(). -AM_INIT_AUTOMAKE(mysql, 5.1.32) +AM_INIT_AUTOMAKE(mysql, 5.1.33) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10