bzr commit into mysql-6.0-codebase-bugfixing branch (omer:3839)

[Omer BarNir]

#At file:///home/omer/my_bzr/g_60-codebase/ based on revid:omer@stripped

 3839 Omer BarNir	2010-02-04 [merge]
      Merge up fix for pseudo_thread_id test (WL4738)

    modified:
      mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result
      mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test
=== modified file 'mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result'
--- a/mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result	2010-02-03 17:11:16 +0000
+++ b/mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result	2010-02-04 20:14:51 +0000
@@ -3,9 +3,6 @@ ERROR HY000: Variable 'pseudo_thread_id'
 select @@session.pseudo_thread_id between 1 and 10000;
 @@session.pseudo_thread_id between 1 and 10000
 1
-select @@session.pseudo_thread_id;
-@@session.pseudo_thread_id
-2
 should be empty
 show global variables like 'pseudo_thread_id';
 Variable_name	Value

=== modified file 'mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test'
--- a/mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test	2010-02-03 17:11:16 +0000
+++ b/mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test	2010-02-04 20:14:51 +0000
@@ -11,7 +11,6 @@ select @@global.pseudo_thread_id;
 
 # Check the variable has a valid numeric value (assumed to be less then 10000)
 select @@session.pseudo_thread_id between 1 and 10000;
-select @@session.pseudo_thread_id;
 
 --echo should be empty
 show global variables like 'pseudo_thread_id';


Attachment: [text/bzr-bundle] bzr/[e-mail]