unknown 13dc35cd0d Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint ...

into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
vio/viosslfactories.c:
  Auto merged

2006-11-08 06:16:12 +03:00

..

atomic

support for xadd emulation, workaround for Darwin

2006-06-29 15:39:53 +02:00

mysql

Added license information display to output of plugins schema, and tagged all plugins with GPL flag.

2006-10-05 00:41:29 -07:00

.cvsignore

…

abi_check

Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory>

2006-11-07 11:07:27 +01:00

abi_check.ic

Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory>

2006-11-07 11:07:27 +01:00

base64.h

BUG#19459 (BINLOG RBR command does not lock tables correctly causing

2006-10-02 15:05:05 +02:00

config-netware.h

Merge moonbone.local:/work/tmp_merge-5.0-mysql

2006-08-29 18:58:50 +04:00

config-win.h

Windows 64bit fixes

2006-09-21 15:19:20 +02:00

decimal.h

Bug#16172 DECIMAL data type processed incorrectly

2006-08-08 16:03:42 +05:00

errmsg.h

errmsg.txt:

2006-09-07 13:52:30 +10:00

ft_global.h

…

hash.h

Small cleanup in code handling stored routines/table prelocking.

2006-11-01 15:41:48 +03:00

heap.h

This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).

2006-09-30 12:49:46 -07:00

help_end.h

…

help_start.h

…

keycache.h

…

m_ctype.h

Merge mysql.com:/home/hf/mysql-5.0.mrg

2006-10-12 15:42:05 +05:00

m_string.h

Merge rama.(none):/home/jimw/my/mysql-5.0-clean

2006-09-28 20:20:33 -07:00

Makefile.am

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

2006-11-04 09:32:36 +01:00

md5.h

…

my_aes.h

…

my_alarm.h

…

my_alloc.h

…

my_atomic.h

compile-time definition of intptr type

2006-08-01 14:02:19 +02:00

my_base.h

Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt

2006-10-19 16:43:46 +02:00

my_bitmap.h

This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes

2006-06-04 18:52:22 +03:00

my_dbug.h

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016

2006-10-17 12:00:36 -04:00

my_dir.h

…

my_getopt.h

…

my_global.h

thr_alarm.c, thr_lock.c, my_global.h:

2006-10-12 19:43:47 +02:00

my_handler.h

After merge fixes

2006-06-30 20:07:33 +03:00

my_libwrap.h

Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"

2006-06-21 18:35:19 +03:00

my_list.h

…

my_net.h

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

2006-09-15 18:19:09 -04:00

my_no_pthread.h

UNIXWARE removal

2006-04-17 15:56:59 -07:00

my_nosys.h

removing MSDOS defines and code

2006-05-08 14:50:13 -05:00

my_pthread.h

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

2006-05-19 19:07:33 -07:00

my_semaphore.h

…

my_sys.h

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2006-10-19 10:15:08 +02:00

my_time.h

Merge polly.local:/tmp/maint/bug11655/my51-bug11655

2006-10-12 12:36:13 +04:00

my_tree.h

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new

2006-05-08 15:15:05 -05:00

my_trie.h

…

my_uctype.h

WL#1386 - CTYPE table for unicode character sets

2006-02-02 10:07:47 +04:00

my_user.h

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

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

my_vle.h

…

my_xml.h

…

myisam.h

Merge chilla.local:/home/mydev/mysql-5.0-bug8283

2006-10-09 22:24:55 +02:00

myisammrg.h

This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes

2006-06-04 18:52:22 +03:00

myisampack.h

…

mysql_com.h

Merge siva.hindu.god:/usr/home/tim/m/bk/g51

2006-09-29 17:01:16 -06:00

mysql_embed.h

…

mysql_h.ic

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

2006-11-03 14:40:52 +01:00

mysql_time.h

…

mysql_version.h.in

…

mysql.h

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

2006-10-24 21:05:35 +02:00

mysys_err.h

After merge fixes

2006-05-04 06:28:24 +03:00

queues.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

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

2006-08-02 14:13:01 +04:00

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

Another long patch to remove the rest of the OS2 support.

2006-04-15 08:49:00 -07:00

thr_lock.h

WL #2604: Partition Management

2006-01-17 08:40:00 +01:00

typelib.h

…

violite.h

Re-apply missing changeset, orignally pushed by elliot

2006-06-06 14:21:07 +03:00