diff options
| author | unknown <serg@serg.mylan> | 2005-02-17 14:00:44 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-17 14:00:44 +0100 |
| commit | 7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88 (patch) | |
| tree | 2286825455d6ff56f96a8bcd52bbb6737ebcd354 /libmysqld | |
| parent | d6541adb37068d6545fd6f871e4dd63fa8b1e90a (diff) | |
| parent | c5c497164fbc48bcc50770ced833a07788082aaf (diff) | |
| download | mariadb-git-7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r--[-rwxr-xr-x] | libmysqld/libmysqld.rc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libmysqld/resource.h | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.rc b/libmysqld/libmysqld.rc index 5b6142faddf..5b6142faddf 100755..100644 --- a/libmysqld/libmysqld.rc +++ b/libmysqld/libmysqld.rc diff --git a/libmysqld/resource.h b/libmysqld/resource.h index f770fe490a6..f770fe490a6 100755..100644 --- a/libmysqld/resource.h +++ b/libmysqld/resource.h |