unknown 3960c84f12 manually merged ... 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		2005-04-06 21:19:20 +02:00
..
Makefile.am	InnoDB: Remove unused module os0shm	2004-05-17 10:49:01 +03:00
makefilewin	InnoDB: Remove unused module os0shm	2004-05-17 10:49:01 +03:00
os0file.c	manually merged	2005-04-06 21:19:20 +02:00
os0proc.c	Fixed compilation for old Linux distributions that have no HugeTLB support	2004-12-20 20:17:36 +03:00
os0sync.c	InnoDB: Portability fixes for warnings reported on IA-64 Windows	2005-03-07 12:03:33 +02:00
os0thread.c	merged	2005-03-09 14:09:06 +01:00