mariadb/include
unknown 8dc5c95b14 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
configure.in:
  Resolve conflicts
2005-09-12 17:00:50 -07:00
..
.cvsignore
config-netware.h Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 2005-08-19 15:29:30 -04:00
config-os2.h
config-win.h fix compile warning in Visual Studio 2003 2005-08-01 17:07:19 -05:00
decimal.h A lot of fixes to Precision math 2005-05-05 20:06:49 +05:00
errmsg.h A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work" 2005-05-16 18:27:21 +04:00
ft_global.h indexless boolean fulltext search was depending on default_charset_info - Bug#8159 2005-02-04 15:24:06 +01:00
hash.h Followup: rename the declaration (hash_reset -> my_hash_reset) 2005-01-11 13:57:07 +03:00
heap.h Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way 2005-03-16 01:15:45 +02:00
help_end.h Several fixes for Netware. 2005-08-24 22:03:34 +03:00
help_start.h Several fixes for Netware. 2005-08-24 22:03:34 +03:00
keycache.h Final patch for BUG#4285. 2005-01-19 12:55:54 +02:00
m_ctype.h Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 2005-08-19 15:29:30 -04:00
m_string.h Add my_str_malloc and _free function pointers to strings library 2005-06-24 13:41:33 -07:00
Makefile.am remove the rest of isam/merge references 2005-04-05 13:17:49 +02:00
md5.h
my_aes.h
my_alarm.h
my_alloc.h Fix incorrect spellings of "dropped" in source and tests. (Bug #12828) 2005-08-30 12:24:37 -07:00
my_base.h Bug#8321 - myisampack bug in compression algorithm 2005-06-24 19:34:55 +02:00
my_bitmap.h Bug#10932 - Building server with key limit of 128, makes test cases fail 2005-07-19 14:13:56 +02:00
my_dbug.h Fixed bug from last push 2005-05-18 21:12:59 +03:00
my_dir.h
my_getopt.h
my_global.h Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-09-12 17:00:50 -07:00
my_handler.h A fix (bug #10179: error in default value setting). 2005-05-05 17:17:55 +05:00
my_list.h Rename rest() macro in my_list.h to list_rest(). (Bug #12327) 2005-08-09 18:02:36 -07: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 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-09-12 17:00:50 -07:00
my_semaphore.h
my_sys.h Fixes bug #11815. Convert file path to UNIX format to build correct query 2005-08-30 22:19:15 +04:00
my_time.h Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
my_tree.h
my_xml.h
myisam.h Bug#10932 - Building server with key limit of 128, makes test cases fail 2005-07-19 14:13:56 +02:00
myisammrg.h
myisampack.h
mysql.h Merge mysql.com:/home/jimw/my/mysql-5.0-11787 2005-09-03 09:34:34 -07:00
mysql_com.h Merge mysql.com:/home/jimw/my/mysql-5.0-10214 2005-07-05 09:47:20 -07:00
mysql_embed.h remove the rest of isam/merge references 2005-04-05 13:17:49 +02:00
mysql_time.h
mysql_version.h.in
mysys_err.h Show all generated warnings in SHOW ERROR 2005-02-24 23:33:42 +02:00
queues.h
raid.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
rijndael.h
sha1.h
sql_common.h
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h
thr_lock.h Merge mysql.com:/home/my/mysql-4.1 2005-07-28 17:09:54 +03:00
typelib.h
violite.h Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-09-12 17:00:50 -07:00