summaryrefslogtreecommitdiff
path: root/os2
diff options
context:
space:
mode:
authorkent@mysql.com <>2005-09-29 03:20:31 +0200
committerkent@mysql.com <>2005-09-29 03:20:31 +0200
commit656b0cc15a6b6abc43c5e765c8b2dc96859a2ea7 (patch)
tree38ed48baf66a457188a181eeff05f39f32789b9b /os2
parent6e10a589e1b5ca9c8902f17b2701dccd00840bd5 (diff)
parent844d964f2d23e82697c0f3aed59dbf043f6e4128 (diff)
downloadmariadb-git-656b0cc15a6b6abc43c5e765c8b2dc96859a2ea7.tar.gz
Merge
Diffstat (limited to 'os2')
-rw-r--r--os2/MySQL-Source.icc4
1 files changed, 2 insertions, 2 deletions
diff --git a/os2/MySQL-Source.icc b/os2/MySQL-Source.icc
index de0ac75ec9c..342cb6c96b9 100644
--- a/os2/MySQL-Source.icc
+++ b/os2/MySQL-Source.icc
@@ -12,7 +12,7 @@ group client_global_pch =
'm_ctype.h', 'mysqld_error.h',
'my_list.h', 'my_sys.h', 'my_net.h',
'myisam.h', 'myisampack.h', '.\myisam\myisamdef.h',
- '.\regex\regex.h'
+ '.\regex\my_regex.h'
group server_global_pch =
'os2.h',
@@ -38,7 +38,7 @@ group server_global_pch =
'my_tree.h', '..\mysys\my_static.h', 'netdb.h',
'thr_alarm.h', 'heap.h', '..\myisam\fulltext.h',
'..\myisam\ftdefs.h', 'myisammrg.h',
- '.\regex\regex.h'
+ '.\regex\my_regex.h'
group server_pch =
'ha_heap.h', 'ha_myisammrg.h', 'opt_ft.h',