-
unknown authored
client/mysqlimport.c: Auto merged configure.in: Auto merged include/my_global.h: Auto merged mysql-test/r/connect.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/t/connect.test: Auto merged mysql-test/t/func_gconcat.test: Auto merged ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged ndb/src/kernel/main.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged ndb/src/ndbapi/Makefile.am: Auto merged ndb/test/src/NdbBackup.cpp: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/sql_select.cc: Auto merged
20994fec