database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/usr/home/bar/mysql-4.1.b10201

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
include/config-netware.h:
  auto merge fix
libmysql/libmysql.def:
  after merge fix
sql/item_func.cc:
  SCCS merged
This commit is contained in:
unknown
2005-07-26 13:25:18 +05:00
parent 4cc9707e6c d66d45ef8e
commit 5fa6e3c557
9 changed files with 234 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysql/libmysql.def
View File

@ -148,6 +148,7 @@ EXPORTS
mysql_embedded
mysql_server_init
mysql_server_end
get_defaults_files
mysql_set_character_set
mysql_get_character_set_info
get_defaults_options