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

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

Browse Source 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
This commit is contained in:
mskold@mysql.com
2005-01-13 10:49:01 +01:00
parent 27c13fa33f ca8a6d85ad
commit 290489e657
109 changed files with 38303 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_cmpfunc.cc
View File

@@ -2543,7 +2543,7 @@ longlong Item_func_regex::val_int()
regfree(&preg);
regex_compiled=0;
}
if (regcomp(&preg,res2->c_ptr(),
if (regcomp(&preg,res2->c_ptr_safe(),
((cmp_collation.collation->state &
(MY_CS_BINSORT | MY_CS_CSSORT)) ?
REG_EXTENDED | REG_NOSUB :