unknown 719bfafc2f Merge mysql.com:/home/jimw/my/mysql-5.0-1039 ...

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
include/sslopt-longopts.h:
  Resolve conflict
include/sslopt-vars.h:
  Resolve conflict
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict

2006-05-19 16:17:24 -07:00

..

.cvsignore

…

base64.h

…

config-netware.h

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

2006-01-12 20:28:23 +02:00

config-os2.h

…

config-win.h

Fix for Win build

2006-05-01 22:16:08 +05:00

decimal.h

…

errmsg.h

…

ft_global.h

…

hash.h

A fix for Bug#7209 "Client error with "Access Denied" on updates

2006-01-04 17:35:30 +03:00

heap.h

Bug #12796: Record lost in HEAP table

2005-11-08 00:26:37 -05:00

help_end.h

…

help_start.h

…

keycache.h

…

m_ctype.h

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1

2006-03-23 14:29:43 +04:00

m_string.h

…

Makefile.am

Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause

2006-01-11 02:07:40 +03:00

md5.h

…

my_aes.h

…

my_alarm.h

…

my_alloc.h

…

my_base.h

Merge mysql.com:/home/mydev/mysql-4.1-bug14980

2006-03-10 15:06:04 +01:00

my_bitmap.h

…

my_dbug.h

Fix two Valgrind memory leak warnings.

2006-05-15 18:07:18 +02:00

my_dir.h

…

my_getopt.h

…

my_global.h

Fix spelling error

2006-04-07 12:46:50 +02:00

my_handler.h

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

2005-10-27 23:43:20 +03:00

my_list.h

…

my_net.h

…

my_no_pthread.h

Include the system header file "pthread.h" even in a non-threaded build.

2006-03-10 17:13:54 +01:00

my_nosys.h

…

my_pthread.h

Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711

2006-05-19 13:09:15 +02:00

my_semaphore.h

…

my_sys.h

Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix

2006-05-15 19:57:12 +02:00

my_time.h

…

my_tree.h

BUG#18160 - Memory-/HEAP Table endless growing indexes

2006-04-19 15:13:50 +05:00

my_user.h

Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause

2006-01-11 02:07:40 +03:00

my_xml.h

…

myisam.h

WL#2645 (CHECK TABLE FOR UPGRADE)

2006-02-17 10:52:32 +04:00

myisammrg.h

…

myisampack.h

…

mysql_com.h

Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause

2006-01-11 02:07:40 +03:00

mysql_embed.h

…

mysql_time.h

…

mysql_version.h.in

…

mysql.h

Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208

2006-04-26 22:24:25 +02:00

mysys_err.h

…

queues.h

…

raid.h

…

rijndael.h

…

sha1.h

A fix for Bug#13944 "libmysqlclient exporting sha1_result function":

2006-01-11 17:31:52 +03:00

sql_common.h

…

sslopt-case.h

…

sslopt-longopts.h

Merge mysql.com:/home/jimw/my/mysql-5.0-1039

2006-05-19 16:17:24 -07:00

sslopt-vars.h

Merge mysql.com:/home/jimw/my/mysql-5.0-1039

2006-05-19 16:17:24 -07:00

t_ctype.h

…

thr_alarm.h

…

thr_lock.h

…

typelib.h

…

violite.h

Remove valgrind and compiler warnings

2006-05-08 17:14:06 +02:00