Konstantin Osipov a72f90bc43 Merge next-mr -> next-4284. ...

mysql-test/t/disabled.def:
  Restore disabled ssl tests: SSL certificates were updated.
  Disable sp_sync.test, the test case can't work in next-4284.
mysql-test/t/partition_innodb.test:
  Disable parsing of the test case for Bug#47343, 
  the test can not work in next-4284.
mysql-test/t/ps_ddl.test:
  Update results (CREATE TABLE IF NOT EXISTS takes
  into account existence of the temporary table).

2010-02-06 13:28:06 +03:00

..

atomic

merged

2009-12-24 21:18:53 +01:00

mysql

Merge backport of WL#3771 with mysql-next-mr.

2010-01-19 17:30:55 +04:00

base64.h

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

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

config-netware.h

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

config-win.h

Manual merge from mysql-next-mr.

2010-01-18 23:19:19 +03: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

Merge from mysql-next-mr.

2009-10-28 10:55:44 +03:00

ft_global.h

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

hash.h

WL#5137, Remove hash calculation from LOCK_open in open_table

2009-11-20 19:27:54 +01:00

heap.h

WL#2360 Performance schema

2009-12-04 18:26:15 -07:00

help_end.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

help_start.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

keycache.h

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

lf.h

WL#3230 concurrent hash

2009-11-17 19:31:40 -07:00

m_ctype.h

WL#4583 Case conversion in Asian character sets

2010-01-14 15:17:57 +04:00

m_string.h

Manual merge from mysql-trunk-merge.

2010-01-19 19:36:14 +03:00

Makefile.am

Backport from 6.0-codebase.

2009-12-15 23:52:47 +04:00

my_aes.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

my_alarm.h

Backport of:

2009-11-24 16:54:59 +03: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

fix atomic/solaris.h to conform

2009-12-23 09:27:41 +01: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

Merge next-mr -> next-4284.

2010-02-03 03:06:42 +03:00

my_bit.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

my_bitmap.h

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_dbug.h

merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640

2009-11-06 18:35:04 +02:00

my_dir.h

This is the downport of

2009-09-11 22:26:35 +02:00

my_getopt.h

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

my_global.h

Merge next-mr -> next-4284.

2010-02-03 03:06:42 +03:00

my_handler.h

Backporting WL#4164 Two-byte collation IDs

2009-10-15 15:17:32 +05:00

my_libwrap.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02: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

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

my_net.h

Backport of WL#798 (MySQL IPv6 support) from 6.0.

2009-11-25 13:53:23 +03:00

my_no_pthread.h

Manual merge from mysql-trunk-merge.

2009-12-16 21:02:21 +03: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

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

my_rdtsc.h

WL#2373 Use cycle counter for timing

2009-11-24 16:36:31 -07:00

my_stacktrace.h

Merging from 5.0-bugteam

2010-01-27 11:42:20 +01:00

my_sys.h

Merge next-mr -> next-4284.

2010-02-02 12:22:17 +03:00

my_time.h

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01: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

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02: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

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

myisammrg.h

WL#2360 Performance schema

2009-12-04 18:26:15 -07:00

myisampack.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

mysql_com.h

merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge

2010-01-07 15:39:11 +00:00

mysql_embed.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02: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

Manual merge from mysql-trunk.

2009-12-11 12:39:38 +03:00

mysql.h.pp

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

mysys_err.h

WL#2936

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

probes_mysql.d.base

Fixing some issues in the build when using DTrace probes

2009-03-18 10:04:15 +00:00

probes_mysql.h

Backport of DTrace patches from 6.0

2008-12-20 11:01:41 +01:00

queues.h

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

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

rijndael.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

service_versions.h

WL#4903 Plugin Service API part I

2009-11-02 21:05:42 +01:00

sha1.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

sql_common.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

sslopt-case.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

sslopt-longopts.h

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

sslopt-vars.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02: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

Merge next-mr -> next-4284.

2010-02-02 02:22:16 +03:00

typelib.h

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

violite.h

Manual merge from mysql-trunk-merge.

2009-12-12 23:38:59 +03:00