Alexander Nozdrin aceea2342f Manual merge from mysql-trunk-merge. ...

Conflicts:
  - extra/comp_err.c
  - mysql-test/collections/default.experimental
  - mysql-test/r/archive.result
  - mysql-test/r/select.result
  - mysql-test/suite/binlog/r/binlog_unsafe.result
  - mysql-test/suite/binlog/t/binlog_unsafe.test
  - mysql-test/suite/rpl/t/disabled.def
  - mysql-test/t/archive.test
  - mysql-test/t/select.test
  - sql/item.cc
  - sql/item.h
  - sql/item_timefunc.cc
  - sql/sql_base.cc
  - sql/sql_delete.cc
  - sql/sql_load.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
  - storage/innobase/handler/ha_innodb.cc
  - vio/vio.c

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

..

funcs_1

Post merge fix for

2008-04-01 13:18:31 +02:00

ndb_backup50

BUG#22240 Add a test case into ndb_restore_compat

2007-08-17 11:41:32 +08:00

ndb_backup51

modified ndb backup/restore to be byte order independant

2006-04-25 14:02:15 +02:00

ndb_backup51_data_be

BUG#27543 Backup and restore can compatible with different endians for blob attribute

2007-09-05 13:01:30 +00:00

ndb_backup51_data_le

BUG#27543 Backup and restore can compatible with different endians for blob attribute

2007-09-05 13:01:30 +00:00

parts

Bug#39893: Crash if select on a partitioned table, when partitioning is disabled

2009-01-08 15:16:44 +01:00

14897.frm

A fix for Bug#14897 "ResultSet.getString("table.column") sometimes

2006-08-30 00:38:58 +04:00

bad_gis_data.dat

bug #22372

2006-12-06 21:47:29 +04:00

binlog_transaction.000001

Bug #46998 mysqlbinlog can't output BEGIN even if the database is included in a transaction

2009-09-30 10:01:52 +08:00

bug15328.cnf

Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence

2006-05-11 14:13:14 +02:00

bug16266.000001

Fix for BUG#16266: Definer is not fully qualified error during replication.

2006-03-01 14:13:07 +03:00

bug19371.frm

Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1

2006-11-09 12:00:27 +01:00

bug19371.MYD

Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1

2006-11-09 12:00:27 +01:00

bug19371.MYI

Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1

2006-11-09 12:00:27 +01:00

bug30435_5k.txt

bug#30435

2007-12-23 11:18:46 +02:00

bug30435_10k_items.txt

bug#30435

2007-12-23 11:18:46 +02:00

bug33029-slave-relay-bin.000001

BUG#33029 5.0 to 5.1 replication fails on dup key when inserting

2008-03-14 11:35:41 +08:00

bug35469.dat

Fix tree:

2008-03-28 23:39:47 +03:00

bug36055.frm

Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables

2008-05-12 21:01:13 +05:00

bug36055.MYD

Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables

2008-05-12 21:01:13 +05:00

bug36055.MYI

Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables

2008-05-12 21:01:13 +05:00

bug37631.frm

BUG#37631 - Incorrect key file for table after upgrading from 5.0 to 5.1

2009-04-30 18:16:49 +05:30

bug37631.MYD

BUG#37631 - Incorrect key file for table after upgrading from 5.0 to 5.1

2009-04-30 18:16:49 +05:30

bug37631.MYI

BUG#37631 - Incorrect key file for table after upgrading from 5.0 to 5.1

2009-04-30 18:16:49 +05:30

bug40482-bin.000001

BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event

2008-12-29 17:04:10 +01:00

bug47012.ARM

Bug #47012 archive tables are not upgradeable, and server crashes

2009-11-11 13:33:29 +05:30

bug47012.ARZ

Bug #47012 archive tables are not upgradeable, and server crashes

2009-11-11 13:33:29 +05:30

bug47012.frm

Bug #47012 archive tables are not upgradeable, and server crashes

2009-11-11 13:33:29 +05:30

cacert.pem

Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"

2009-01-28 16:18:50 +02:00

charset_utf8.txt

System variable tests delivered by Folio3 (see WL4288).

2008-04-10 15:14:28 +02:00

client-cert.pem

Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"

2009-01-28 16:18:50 +02:00

client-key.pem

Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"

2009-01-28 16:18:50 +02:00

corrupt_t1.MYI

Bug#35161: --myisam-recover does not work for partitioned MyISAM tables

2008-07-07 17:54:42 +02:00

corrupt_t1#P#p1.MYI

Bug#35161: --myisam-recover does not work for partitioned MyISAM tables

2008-07-07 17:54:42 +02:00

corrupt-relay-bin.000624

BUG#31793 (log event corruption causes crash):

2007-11-09 13:43:09 +01:00

des_key_file

…

Index.xml

Backporting Bug#37129 LDML lacks <i> rule

2009-11-09 13:45:40 +04:00

init_file.dat

Bug#43587: Putting event_scheduler=1 in init SQL file crashes

2009-07-24 15:45:42 -03:00

latin1.xml

Bug#46448 trailing spaces are not ignored when user collation maps space != 0x20

2009-10-12 15:25:59 +05:30

loaddata1.dat

…

loaddata2.dat

…

loaddata3.dat

…

loaddata4.dat

…

loaddata5.dat

…

loaddata6.dat

Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it)

2007-02-28 17:06:57 +04:00

loaddata_dq.dat

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

2005-10-26 14:11:08 -07:00

loaddata_pair.dat

…

loaddata_utf8.dat

BUG#45516 SQL thread does not use database charset properly

2009-08-12 11:54:05 +08:00

loadxml2.dat

WL#1397 convert XML -> SQL

2009-10-12 11:22:53 +05:00

loadxml.dat

WL#1397 convert XML -> SQL

2009-10-12 11:22:53 +05:00

master-bin.000001

…

Moscow_leap

Bug #39920: MySQL cannot deal with Leap Second expression in string literal.

2008-12-01 16:18:35 +02:00

ndb_config_config.ini

WL#4189

2007-12-12 18:19:24 +01:00

ndb_config_mycnf1.cnf

ndb

2005-09-30 12:19:15 +02:00

ndb_config_mycnf2.cnf

Bug #13009 No gaps allowed in node id number sequence

2005-10-12 14:17:39 +02:00

numbers.txt

System variable tests delivered by Folio3 (see WL4288).

2008-04-10 15:14:28 +02:00

old_table-323.frm

Added --debug-info to most clients to detect memory leaks in mysql-test-run

2006-11-21 22:32:58 +02:00

rpl_bug28618.dat

BUG#37858: loaddata,rpl_slave_skip,rpl_innodb_mixed_dml fail if datafile not world-readable

2008-07-04 11:33:34 +02:00

rpl_loaddata2.dat

…

rpl_loaddata.dat

…

rpl_mixed.dat

BUG#37858: loaddata,rpl_slave_skip,rpl_innodb_mixed_dml fail if datafile not world-readable

2008-07-04 11:33:34 +02:00

rpl_timezone2.dat

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_timezone.dat

…

server8k-cert.pem

Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"

2009-01-28 16:18:50 +02:00

server8k-key.pem

Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"

2009-01-28 16:18:50 +02:00

server-cert.pem

Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"

2009-01-28 16:18:50 +02:00

server-key.pem

Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"

2009-01-28 16:18:50 +02:00

trunc_binlog.000001

…

untrusted-cacert.pem

Add an untrusted cacert used when testing

2006-05-03 14:10:22 +02:00

vchar.frm

…

warnings_loaddata.dat

…

words2.dat

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

words.dat

…