Luis Soares df8543868d merge: 5.1 -> 5.1-rpl ...

conflicts:
  Text conflict in client/mysqltest.cc
  Text conflict in mysql-test/include/wait_until_connected_again.inc
  Text conflict in mysql-test/lib/mtr_report.pm
  Text conflict in mysql-test/mysql-test-run.pl
  Text conflict in mysql-test/r/events_bugs.result
  Text conflict in mysql-test/r/log_state.result
  Text conflict in mysql-test/r/myisam_data_pointer_size_func.result
  Text conflict in mysql-test/r/mysqlcheck.result
  Text conflict in mysql-test/r/query_cache.result
  Text conflict in mysql-test/r/status.result
  Text conflict in mysql-test/suite/binlog/r/binlog_index.result
  Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result
  Text conflict in mysql-test/suite/rpl/r/rpl_packet.result
  Text conflict in mysql-test/suite/rpl/t/rpl_packet.test
  Text conflict in mysql-test/t/disabled.def
  Text conflict in mysql-test/t/events_bugs.test
  Text conflict in mysql-test/t/log_state.test
  Text conflict in mysql-test/t/myisam_data_pointer_size_func.test
  Text conflict in mysql-test/t/mysqlcheck.test
  Text conflict in mysql-test/t/query_cache.test
  Text conflict in mysql-test/t/rpl_init_slave_func.test
  Text conflict in mysql-test/t/status.test

2009-01-23 13:22:05 +01:00

..

atomic

Bug#33728 Atomic builtins

2008-01-11 20:34:36 -02:00

mysql

WL#4380

2008-06-17 17:57:04 +05:30

.cvsignore

…

base64.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

config-netware.h

Many files:

2007-07-23 23:54:55 +02:00

config-win.h

merged 5.1-main -> 5.1-bugteam

2009-01-05 18:10:20 +02:00

decimal.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

errmsg.h

Bug#27430 "Crash in subquery code when in PS and table DDL changed after

2008-05-20 20:36:26 +04:00

ft_global.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

hash.h

Added "Sun Microsystems, Inc." to copyright headers on files modified

2008-11-10 21:21:49 +01:00

heap.h

Added support for 'internal temporary tables' in HEAP tables.

2007-07-25 01:58:12 +03:00

help_end.h

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

help_start.h

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

keycache.h

Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0. This is for bug #5731.

2007-08-29 20:45:04 +04:00

m_ctype.h

5.0-bugteam->5.1-bugteam merge

2008-12-23 18:21:01 +04:00

m_string.h

Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main

2008-02-08 12:13:33 +01:00

Makefile.am

Bug#39571 abi_check Does not create all prerequisites

2008-10-27 12:53:28 +05:30

my_aes.h

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

my_alarm.h

Many files:

2006-12-23 20:17:15 +01:00

my_alloc.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_atomic.h

Fixes to merge between 5.1-main and 5.1-marvel

2007-10-15 18:22:19 +03:00

my_attribute.h

Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h

2007-04-12 00:43:25 +02:00

my_base.h

Fixed problem with non-synchronous error lists

2008-03-28 18:45:03 +02:00

my_bit.h

Fixes to merge between 5.1-main and 5.1-marvel

2007-10-15 18:22:19 +03:00

my_bitmap.h

Bug#31552 Replication breaks when deleting rows from out-of-sync table

2007-12-12 12:14:59 +02:00

my_dbug.h

Bug#38522: 5 seconds delay when closing application using embedded server

2008-12-04 19:41:53 +01:00

my_dir.h

Many files:

2006-12-23 20:17:15 +01:00

my_getopt.h

Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>

2008-02-18 23:29:39 +01:00

my_global.h

merge: 5.1 -> 5.1-rpl

2009-01-23 13:22:05 +01:00

my_handler.h

Fixed problem with non-synchronous error lists

2008-03-28 18:45:03 +02:00

my_libwrap.h

Many files:

2006-12-23 20:17:15 +01:00

my_list.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_md5.h

Avoid the name conflict between the system-provided "md5.h" and the MySQL one

2007-07-19 14:14:03 +02:00

my_net.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_no_pthread.h

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_nosys.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_pthread.h

Bug#38477: my_pthread_setprio can change dispatch class on Solaris, not just priority

2008-10-15 19:28:26 -03:00

my_stacktrace.h

Bug#37003 Tests sporadically crashes with embedded server

2008-06-19 11:02:32 -03:00

my_sys.h

merging

2008-08-23 07:47:43 +05:00

my_time.h

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294

2008-04-03 13:14:57 -04:00

my_tree.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_trie.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_uctype.h

Many files:

2006-12-31 02:29:11 +01:00

my_user.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_vle.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_xml.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myisam.h

merging

2008-08-23 07:47:43 +05:00

myisammrg.h

Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)

2008-04-26 02:45:58 +05:00

myisampack.h

Many files:

2006-12-23 20:17:15 +01:00

mysql_com.h

Bug#27430 "Crash in subquery code when in PS and table DDL changed after

2008-05-20 20:36:26 +04:00

mysql_embed.h

Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server

2007-11-18 00:32:06 +04:00

mysql_time.h

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

mysql_version.h.in

Bug #15327: configure: --with-tcp-port option being partially ignored

2007-09-13 16:19:46 +02:00

mysql.h

Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0

2007-11-26 16:10:26 -02:00

mysql.h.pp

WL#4380

2008-08-08 14:30:05 +05:30

mysys_err.h

WL#2936

2007-03-02 08:43:45 -08:00

queues.h

Bug #31890 Partitions: ORDER BY DESC in InnoDB not working.

2007-11-14 22:20:31 +04:00

rijndael.h

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

sha1.h

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

sql_common.h

Merge mysql.com:/home/hf/work/25097/my50-25097

2008-02-27 13:00:59 +04:00

sslopt-case.h

Many files:

2006-12-23 20:17:15 +01:00

sslopt-longopts.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

sslopt-vars.h

Many files:

2006-12-23 20:17:15 +01:00

t_ctype.h

Many files:

2006-12-23 20:17:15 +01:00

thr_alarm.h

fixes for build failures due to my yesterday's changeset forbidding

2008-02-19 18:45:11 +01:00

thr_lock.h

Added "Sun Microsystems, Inc." to copyright headers on files modified

2008-11-10 21:21:49 +01:00

typelib.h

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

2007-04-27 19:09:39 +02:00

violite.h

Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50

2007-06-15 19:06:06 +02:00