Commit 77b7a71d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge 

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge


mysql-test/r/func_misc.result:
  Manual merge of the fix for bug#16501.
mysql-test/t/func_misc.test:
  Manual merge of the fix for bug#16501.
sql/item_func.cc:
  Manual merge of the fix for bug#16501.
sql/sql_acl.cc:
  For the fix of bug#16372, use local version, since the fix for 5.0 is
  different, and will go in separate ChangeSet.
parents 5e5f38ac 8515e8f0

Docs/changelog-4.0.xml

deleted100755 → 0
+0 −18
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

<!--

This is a dummy changelog file. Don't use it yet.

It merges upward without conflict.

-->

<appendix id="news-4-0-x">



 <title>

  Changes in release 4.0.x

 </title>



 <para>

  This is a dummy changelog file. Don't use it yet.

 </para>



</appendix>

Docs/changelog-4.1.xml

deleted100755 → 0
+0 −18
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

<!--

This is a dummy changelog file. Don't use it yet.

It merges upward without conflict.

-->

<appendix id="news-4-1-x">



 <title>

  Changes in release 4.1.x

 </title>



 <para>

  This is a dummy changelog file. Don't use it yet.

 </para>



</appendix>

mysql-test/r/func_misc.result

+36 −0
Original line number Diff line number Diff line
@@ -51,6 +51,42 @@ select a from t1 where mid(a+0,6,3) = ( mid(20040106123400,6,3) ); 
a

2004-01-06 12:34:00

drop table t1;

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (conn CHAR(7), connection_id INT);

INSERT INTO t1 VALUES ('default', CONNECTION_ID());

SELECT GET_LOCK('bug16501',600);

GET_LOCK('bug16501',600)

1

INSERT INTO t1 VALUES ('con1', CONNECTION_ID());

SELECT IS_USED_LOCK('bug16501') = connection_id

FROM t1

WHERE conn = 'default';

IS_USED_LOCK('bug16501') = connection_id

1

 SELECT GET_LOCK('bug16501',600);

SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();

IS_USED_LOCK('bug16501') = CONNECTION_ID()

1

SELECT RELEASE_LOCK('bug16501');

RELEASE_LOCK('bug16501')

1

SELECT IS_USED_LOCK('bug16501') = connection_id

FROM t1

WHERE conn = 'con1';

IS_USED_LOCK('bug16501') = connection_id

1

GET_LOCK('bug16501',600)

1

SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();

IS_USED_LOCK('bug16501') = CONNECTION_ID()

1

SELECT RELEASE_LOCK('bug16501');

RELEASE_LOCK('bug16501')

1

SELECT IS_USED_LOCK('bug16501');

IS_USED_LOCK('bug16501')

NULL

DROP TABLE t1;

create table t1 as select uuid(), length(uuid());

show create table t1;

Table	Create Table

mysql-test/t/func_misc.test

+38 −0
Original line number Diff line number Diff line
@@ -38,6 +38,44 @@ select a from t1 where mid(a+0,6,3) = ( mid(20040106123400,6,3) ); 


drop table t1;





#

# Bug#16501: IS_USED_LOCK does not appear to work

#

--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings



CREATE TABLE t1 (conn CHAR(7), connection_id INT);

INSERT INTO t1 VALUES ('default', CONNECTION_ID());



SELECT GET_LOCK('bug16501',600);



connect (con1,localhost,root,,);

INSERT INTO t1 VALUES ('con1', CONNECTION_ID());

SELECT IS_USED_LOCK('bug16501') = connection_id

FROM t1

WHERE conn = 'default';

send SELECT GET_LOCK('bug16501',600);



connection default;

SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();

SELECT RELEASE_LOCK('bug16501');

SELECT IS_USED_LOCK('bug16501') = connection_id

FROM t1

WHERE conn = 'con1';



connection con1;

reap;

SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();

SELECT RELEASE_LOCK('bug16501');

SELECT IS_USED_LOCK('bug16501');



disconnect con1;

connection default;



DROP TABLE t1;



# End of 4.1 tests



#

sql/item_func.cc

+2 −0
Original line number Diff line number Diff line
@@ -3011,6 +3011,7 @@ void item_user_lock_free(void) 
void item_user_lock_release(User_level_lock *ull)

{

  ull->locked=0;

  ull->thread_id= 0;

  if (--ull->count)

    pthread_cond_signal(&ull->cond);

  else
@@ -3218,6 +3219,7 @@ longlong Item_func_get_lock::val_int() 
  {

    ull->locked=1;

    ull->thread=thd->real_id;

    ull->thread_id= thd->thread_id;

    thd->ull=ull;

    error=0;

  }