Commit cb777ed8 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0 

into deer.(none):/home/hf/work/mysql-4.0.10226
parents 7134f532 21fefc68

sql/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -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

support-files/mysql.spec.sh

+6 −1
Original line number Diff line number Diff line
@@ -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 <lenz@mysql.com>



- Fixed the creation of the mysql user group account in the postinstall

  section (BUG 12348)



* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>



- create a "mysql" user group and assign the mysql user account to that group