diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-28 15:45:54 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-28 15:45:54 +0200 |
| commit | 9a19de7a7f8a0158c461ded17e2f7534de7cc4da (patch) | |
| tree | 528dec167e7d5b69f4dd33fe0f0425da06e0a884 /strings/xml.c | |
| parent | 9c0ee58fc4db70b2189902beec1e9056213cde3f (diff) | |
| parent | f28612eae272fb56f9bb07bddf31852882af7ed8 (diff) | |
| download | mariadb-git-9a19de7a7f8a0158c461ded17e2f7534de7cc4da.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B34747-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B34747-5.1-opt
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/subselect.result:
merged bug 34747 and 33266 5.0-opt->5.1-opt
mysql-test/t/subselect.test:
merged bug 34747 and 33266 5.0-opt->5.1-opt
Diffstat (limited to 'strings/xml.c')
0 files changed, 0 insertions, 0 deletions