From c9c6b8240467c1d60098d6aeea55c8dc8e2bef47 Mon Sep 17 00:00:00 2001 From: "heikki@hundin.mysql.fi" <> Date: Wed, 3 Aug 2005 18:11:55 +0300 Subject: [PATCH 1/3] ha_innodb.cc: Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED) --- sql/ha_innodb.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 81a803e36b9..31c26f774a6 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4928,7 +4928,8 @@ ha_innobase::store_lock( (lock_type == TL_READ_HIGH_PRIORITY && thd->in_lock_tables) || lock_type == TL_READ_WITH_SHARED_LOCKS || lock_type == TL_READ_NO_INSERT || - thd->lex.sql_command != SQLCOM_SELECT) { + (thd->lex->sql_command != SQLCOM_SELECT + && lock_type != TL_IGNORE)) { /* The OR cases above are in this order: 1) MySQL is doing LOCK TABLES ... READ LOCAL, or From 353b3a2cad849085fa0b6d5f23e45f2001e69d14 Mon Sep 17 00:00:00 2001 From: "heikki@hundin.mysql.fi" <> Date: Wed, 3 Aug 2005 18:47:50 +0300 Subject: [PATCH 2/3] ha_innodb.cc: Fix compilation error in previous commit --- sql/ha_innodb.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 31c26f774a6..bcd07198f5c 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4928,7 +4928,7 @@ ha_innobase::store_lock( (lock_type == TL_READ_HIGH_PRIORITY && thd->in_lock_tables) || lock_type == TL_READ_WITH_SHARED_LOCKS || lock_type == TL_READ_NO_INSERT || - (thd->lex->sql_command != SQLCOM_SELECT + (thd->lex.sql_command != SQLCOM_SELECT && lock_type != TL_IGNORE)) { /* The OR cases above are in this order: From 307c9203548244c8d634f613bbb13f7f56db6a06 Mon Sep 17 00:00:00 2001 From: "lenz@mysql.com" <> Date: Thu, 4 Aug 2005 12:22:51 +0200 Subject: [PATCH 3/3] - Fixed the creation of the mysql user group account in the postinstall section of the MySQL-server RPM spec file (BUG#12348) --- support-files/mysql.spec.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index ade774fb4e3..325ebdf2c01 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -371,7 +371,7 @@ fi # Create a MySQL user and group. Do not report any problems if it already # exists. -groupadd -r -c "MySQL server" %{mysqld_user} 2> /dev/null || true +groupadd -r %{mysqld_user} 2> /dev/null || true useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" -g %{mysqld_user} %{mysqld_user} 2> /dev/null || true # Change permissions so that the user that will run the MySQL daemon @@ -562,6 +562,11 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Thu Aug 04 2005 Lenz Grimmer + +- Fixed the creation of the mysql user group account in the postinstall + section (BUG 12348) + * Fri Jul 15 2005 Lenz Grimmer - create a "mysql" user group and assign the mysql user account to that group