database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/alexi/mysql-5.0

Browse Source 
into  mysql.com:/home/alexi/dev/mysql-5.0-1
This commit is contained in:
unknown
2005-08-16 23:33:06 +04:00
parent c1f1118335 f792dd0cc0
commit 3eb66207ae
5 changed files with 153 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/lib/mtr_process.pl
View File

@ -752,6 +752,7 @@ sub mtr_ping_mysqld_server () {
#
##############################################################################
# FIXME check that the pidfile contains the expected pid!
sub sleep_until_file_created ($$$) {
my $pidfile= shift;
@ -762,7 +763,7 @@ sub sleep_until_file_created ($$$) {
{
if ( -r $pidfile )
{
return 1;
return $pid;
}
# Check if it died after the fork() was successful

11
mysql-test/r/select.result
View File

@ -2739,3 +2739,14 @@ DROP TABLE t1,t2;
select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;
x'10' + 0 X'10' + 0 b'10' + 0 B'10' + 0
16 16 2 2
CREATE TABLE BUG_12595(a varchar(100));
INSERT INTO BUG_12595 VALUES ('hakan%'), ('hakank'), ("ha%an");
SELECT * FROM BUG_12595 WHERE a LIKE 'hakan*%' ESCAPE '*';
a
hakan%
SELECT * FROM BUG_12595 WHERE a LIKE 'hakan**%' ESCAPE '**';
ERROR HY000: Incorrect arguments to ESCAPE
SELECT * FROM BUG_12595 WHERE a LIKE 'ha%%an' ESCAPE '%';
a
ha%an
DROP TABLE BUG_12595;

11
mysql-test/t/select.test
View File

@ -2350,3 +2350,14 @@ DROP TABLE t1,t2;
#
select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;
#
# BUG #12595
#
CREATE TABLE BUG_12595(a varchar(100));
INSERT INTO BUG_12595 VALUES ('hakan%'), ('hakank'), ("ha%an");
SELECT * FROM BUG_12595 WHERE a LIKE 'hakan*%' ESCAPE '*';
-- error 1210
SELECT * FROM BUG_12595 WHERE a LIKE 'hakan**%' ESCAPE '**';
SELECT * FROM BUG_12595 WHERE a LIKE 'ha%%an' ESCAPE '%';
DROP TABLE BUG_12595;