Below is the list of changes that have just been committed into a local
4.1 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2350 05/07/27 13:45:06 monty@stripped +6 -0
Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected
BitKeeper/etc/ignore
1.230 05/07/27 13:44:08 monty@stripped +1 -0
added ndb/tools/ndb_config
mysql-test/t/not_embedded_server.test
1.1 05/07/27 13:42:56 monty@stripped +16 -0
New BitKeeper file ``mysql-test/t/not_embedded_server.test''
mysql-test/r/not_embedded_server.result
1.1 05/07/27 13:42:56 monty@stripped +5 -0
New BitKeeper file ``mysql-test/r/not_embedded_server.result''
sql/sql_lex.cc
1.147 05/07/27 13:42:56 monty@stripped +1 -1
Fixed typo
mysql-test/t/ps_grant.test
1.4 05/07/27 13:42:56 monty@stripped +1 -8
Deallocate prepare statements
Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected
mysql-test/t/not_embedded_server.test
1.0 05/07/27 13:42:56 monty@stripped +0 -0
BitKeeper file /home/my/mysql-4.1/mysql-test/t/not_embedded_server.test
mysql-test/r/ps_grant.result
1.5 05/07/27 13:42:56 monty@stripped +1 -4
Deallocate prepare statements
Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected
mysql-test/r/not_embedded_server.result
1.0 05/07/27 13:42:56 monty@stripped +0 -0
BitKeeper file /home/my/mysql-4.1/mysql-test/r/not_embedded_server.result
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: monty
# Host: narttu.mysql.com
# Root: /home/my/mysql-4.1
--- 1.146/sql/sql_lex.cc 2005-07-14 23:01:41 +03:00
+++ 1.147/sql/sql_lex.cc 2005-07-27 13:42:56 +03:00
@@ -561,7 +561,7 @@
grammatically correct.
*/
else if (c == '?' && ((THD*) yythd)->command == COM_PREPARE &&
- !ident_map[cs, yyPeek()])
+ !ident_map[yyPeek()])
return(PARAM_MARKER);
return((int) c);
--- 1.4/mysql-test/r/ps_grant.result 2005-06-16 23:11:39 +03:00
+++ 1.5/mysql-test/r/ps_grant.result 2005-07-27 13:42:56 +03:00
@@ -54,6 +54,7 @@
4
execute s_t9 ;
ERROR 42S02: Table 'mysqltest.t9' doesn't exist
+deallocate prepare s_t9;
revoke all privileges on mysqltest.t1 from second_user@localhost
identified by 'looser' ;
show grants for second_user@localhost ;
@@ -75,7 +76,3 @@
show grants for second_user@localhost ;
ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost'
drop database mysqltest;
-prepare stmt4 from ' show full processlist ';
-execute stmt4;
-Id User Host db Command Time State Info
-number root localhost test Execute time NULL show full processlist
--- 1.3/mysql-test/t/ps_grant.test 2005-05-12 18:49:28 +03:00
+++ 1.4/mysql-test/t/ps_grant.test 2005-07-27 13:42:56 +03:00
@@ -1,7 +1,6 @@
# Can't test grants with embedded server
-- source include/not_embedded.inc
-
let $type= 'MYISAM' ;
################ GRANT/REVOKE/DROP affecting a parallel session ################
@@ -80,6 +79,7 @@
######## Question 2: The table t9 does not exist. ########
--error 1146
execute s_t9 ;
+deallocate prepare s_t9;
#### revoke the access rights to t1
@@ -111,10 +111,3 @@
show grants for second_user@localhost ;
drop database mysqltest;
-
-# Tested here simply so it is not tested with embedded server
-prepare stmt4 from ' show full processlist ';
---replace_column 1 number 6 time 3 localhost
-execute stmt4;
-
-
--- New file ---
+++ mysql-test/r/not_embedded_server.result 05/07/27 13:42:56
prepare stmt1 from ' show full processlist ';
execute stmt1;
Id User Host db Command Time State Info
number root localhost test Execute time NULL show full processlist
deallocate prepare stmt1;
--- New file ---
+++ mysql-test/t/not_embedded_server.test 05/07/27 13:42:56
#
# Here we collect tests that doesn't work with the embedded server
#
-- source include/not_embedded.inc
#
# Show full process list with prepare
# To not show other connections, this must be the first test and we must
# have a server restart before this one
#
prepare stmt1 from ' show full processlist ';
--replace_column 1 number 6 time 3 localhost
execute stmt1;
deallocate prepare stmt1;
--- 1.229/BitKeeper/etc/ignore 2005-07-27 13:21:29 +03:00
+++ 1.230/BitKeeper/etc/ignore 2005-07-27 13:44:08 +03:00
@@ -1053,3 +1053,4 @@
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
+ndb/tools/ndb_config
| Thread |
|---|
| • bk commit into 4.1 tree (monty:1.2350) | monty | 27 Jul |
