mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
3960c84f12
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and Bar's well_formed_len() changes in ndb code did not make it and should be re-applied manually BitKeeper/etc/logging_ok: auto-union include/m_ctype.h: Auto merged innobase/btr/btr0pcur.c: Auto merged innobase/include/btr0pcur.h: Auto merged innobase/include/os0file.h: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0start.c: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/t/user_var.test: Auto merged ndb/include/ndbapi/NdbTransaction.hpp: Auto merged ndb/src/ndbapi/NdbTransaction.cpp: Auto merged ndb/tools/desc.cpp: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d: ul ndb/include/ndbapi/NdbScanOperation.hpp: ul ndb/src/ndbapi/NdbIndexOperation.cpp: ul ndb/src/ndbapi/NdbOperationDefine.cpp: ul ndb/src/ndbapi/NdbOperationSearch.cpp: ul ndb/src/ndbapi/NdbScanOperation.cpp: ul sql/field.cc: manually merged, because bk messed it up sql/sql_yacc.yy: merged |
||
|---|---|---|
| .. | ||
| Ndb.hpp | ||
| ndb_cluster_connection.hpp | ||
| ndb_opt_defaults.h | ||
| NdbApi.hpp | ||
| ndbapi_limits.h | ||
| NdbBlob.hpp | ||
| NdbDictionary.hpp | ||
| ndberror.h | ||
| NdbError.hpp | ||
| NdbEventOperation.hpp | ||
| NdbIndexOperation.hpp | ||
| NdbIndexScanOperation.hpp | ||
| NdbOperation.hpp | ||
| NdbPool.hpp | ||
| NdbRecAttr.hpp | ||
| NdbReceiver.hpp | ||
| NdbScanFilter.hpp | ||
| NdbScanOperation.hpp | ||
| NdbTransaction.hpp | ||