mariadb/include
unknown b99bea6704 manually merged
configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
2004-12-31 15:26:24 +01:00
..
.cvsignore
config-netware.h
config-os2.h
config-win.h Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa 2004-11-11 13:44:10 +01:00
decimal.h Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
errmsg.h Merge with global tree 2004-12-31 00:50:30 +02:00
ft_global.h
hash.h After merge fixes 2004-10-07 10:50:13 +03:00
heap.h Fix for bug#5138 continued: added comments, removed extra debug printf calls, changed ha_heap::records_in_range to use table->rec_per_key. 2004-10-12 18:21:25 +04:00
help_end.h
help_start.h
keycache.h
m_ctype.h bit type 2004-12-17 18:06:05 +04:00
m_string.h
Makefile.am WL#1051, more maintanable error messages. 2004-12-13 22:51:54 +02:00
md5.h
merge.h
my_aes.h
my_alarm.h
my_alloc.h
my_base.h Merge with global tree 2004-12-31 00:50:30 +02:00
my_bitmap.h
my_dbug.h Merge bk-internal:/home/bk/mysql-5.0 2004-11-15 19:27:06 +01:00
my_dir.h
my_getopt.h
my_global.h Portability fix in libmysql (FreeBSD) 2004-12-16 12:43:02 +03:00
my_handler.h After merge fixes 2004-12-31 00:44:00 +02:00
my_list.h one more name clash in public includes fixed 2004-11-02 22:46:55 +01:00
my_net.h BUG#7384 IM fails to compile on Solaris. 2004-12-18 03:21:20 +03:00
my_no_pthread.h
my_nosys.h
my_pthread.h #warning removed 2004-11-17 14:38:01 +01:00
my_semaphore.h
my_sys.h WL#1895 - Print message to error log in case of detected MyISAM corruption 2004-12-23 20:11:38 +01:00
my_time.h Data truncation reporting implementation (libmysql) + post review 2004-12-16 03:15:06 +03:00
my_tree.h
my_xml.h
myisam.h After merge fixes 2004-12-31 03:47:56 +02:00
myisammrg.h
myisampack.h
mysql.h Truncations patch: a post-review fix. 2004-12-18 00:17:25 +03:00
mysql_com.h bit type 2004-12-17 18:06:05 +04:00
mysql_embed.h
mysql_time.h Fix for bug #6266 "Invalid DATETIME value is not handled properly". 2004-11-15 15:44:29 +03:00
mysql_version.h.in
mysys_err.h WL#1895 - Print message to error log in case of detected MyISAM corruption 2004-12-23 20:11:38 +01:00
nisam.h
queues.h Fix for BUG#4177: 2004-11-21 11:51:19 +03:00
raid.h Making 4.1 tree compile with -ansi -pedantic 2004-12-16 16:16:28 +03:00
rijndael.h
sha1.h
sql_common.h Remove stale declaration, fix a typo in comment. 2004-10-15 22:03:11 +04:00
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h
thr_lock.h
typelib.h Bug#6202: ENUMs are not case sensitive even if declared BINARY 2004-10-25 17:51:26 +05:00
violite.h fix indentation 2004-12-23 16:04:40 +05:00