diff options
| author | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
| commit | 14650d4f66f9369eedba534a8434fe82c217e66d (patch) | |
| tree | 38ed48baf66a457188a181eeff05f39f32789b9b /os2 | |
| parent | f75271a53e2895c45c555f786982ad5120aed96b (diff) | |
| parent | 72340d672d573d21871b385b8ca5edd29e839a9b (diff) | |
| download | mariadb-git-14650d4f66f9369eedba534a8434fe82c217e66d.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
os2/MySQL-Source.icc:
Auto merged
regex/Makefile.am:
Auto merged
regex/engine.c:
Auto merged
regex/main.c:
Auto merged
regex/regerror.c:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'os2')
| -rw-r--r-- | os2/MySQL-Source.icc | 4 |
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', |