unknown a5463c252a corrected automerge error ...

configure.in:
  Auto merged
include/my_global.h:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
  Auto merged
ndb/test/ndbapi/flexBench.cpp:
  Auto merged
ndb/test/ndbapi/flexHammer.cpp:
  Auto merged
ndb/test/ndbapi/flexTT.cpp:
  Auto merged
ndb/test/ndbapi/flex_bench_mysql.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  corrected automerge error

2005-02-03 17:00:51 +01:00

..

.cvsignore

…

config-netware.h

A patch for Netware.

2005-01-13 19:24:54 +02:00

config-os2.h

Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345)

2003-08-11 23:43:01 +04:00

config-win.h

Added checking for my.cnf file from environment variable MYSQL_HOME

2005-01-04 20:13:47 +02: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

ft_boolean_syntax made changeable

2004-02-16 18:53:00 +01:00

hash.h

Followup: rename the declaration (hash_reset -> my_hash_reset)

2005-01-11 13:57:07 +03:00

heap.h

limit HEAP table size with max_heap_table_size, better estimation for mem_per_row

2005-01-14 19:49:45 +01:00

help_end.h

A patch for Netware.

2005-01-13 19:24:54 +02:00

help_start.h

A patch for Netware.

2005-01-13 19:24:54 +02:00

keycache.h

Final patch for BUG#4285.

2005-01-19 12:55:54 +02:00

m_ctype.h

CSC#4385: slow sorting for UTF8 large table:

2005-01-26 16:34:09 +04:00

m_string.h

Changed interface for my_strntod() to make it more general and more portable

2005-01-15 12:28:38 +02:00

Makefile.am

small Makefile.am cleanup

2005-01-28 17:14:03 +01:00

md5.h

…

merge.h

…

my_aes.h

…

my_alarm.h

…

my_alloc.h

Small improvement to alloc_root

2002-11-16 20:19:10 +02:00

my_base.h

Merge with global tree

2004-12-31 00:50:30 +02:00

my_bitmap.h

Fixes in opt_range.cc: ROR plan choice code

2005-01-17 00:18:19 +03:00

my_dbug.h

Merge bk-internal:/home/bk/mysql-5.0

2004-11-15 19:27:06 +01:00

my_dir.h

Fix for Bug #1952

2003-12-12 03:39:29 +03:00

my_getopt.h

Merge with 4.0

2004-09-01 04:12:09 +03:00

my_global.h

corrected automerge error

2005-02-03 17:00:51 +01: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

CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS

2003-11-18 13:47:27 +02:00

my_nosys.h

…

my_pthread.h

merged

2005-01-06 19:32:16 +02:00

my_semaphore.h

more #ifdef THREAD added

2003-04-30 12:32:43 +02:00

my_sys.h

timed_mutexes moved to include/my_sys.h and mysys/my_static.c

2005-01-26 18:37:49 +04:00

my_time.h

Data truncation reporting implementation (libmysql) + post review

2004-12-16 03:15:06 +03:00

my_tree.h

after merge fixes

2004-03-18 00:09:13 +02:00

my_xml.h

Portability fixes

2003-02-28 14:32:40 +02:00

myisam.h

First stage of table definition cache

2005-01-06 13:00:13 +02:00

myisammrg.h

key_cmp -> key_cmp_if_same

2004-05-16 14:48:32 +03:00

myisampack.h

Casted all macro arguments,

2004-07-28 21:46:22 +02:00

mysql_com.h

bit type

2004-12-17 18:06:05 +04:00

mysql_embed.h

Merge with 4.0, mainly to get changes to windows project files

2004-05-20 00:54:52 +03:00

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

Merge with 4.0 to get fixes for Windows project files

2004-05-25 02:47:25 +03:00

mysql.h

Truncations patch: a post-review fix.

2004-12-18 00:17:25 +03:00

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

fixed so that --ssl and --skip-ssl works with the MySQL clients.

2002-09-17 23:46:53 +03:00

sslopt-longopts.h

consistency fix - all help texts for command-line options should end with a dot.

2003-06-13 10:59:02 +02:00

sslopt-vars.h

…

t_ctype.h

…

thr_alarm.h

Added patches from Novell

2004-05-25 22:00:14 +03:00

thr_lock.h

Merge with 4.0

2003-03-16 19:17:54 +02:00

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