unknown 45ffe7183d Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt ...

into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-bt-merged


mysql-test/t/loaddata.test:
  Auto merged
mysql-test/r/loaddata.result:
  Manually merged.
sql/share/errmsg.txt:
  Manually merged.
sql/sql_load.cc:
  Manually merged.

2008-03-28 23:54:14 +03: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

Fixes for the following bugs:

2007-08-27 14:08:32 -06: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

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

bug35469.dat

Fix tree:

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

cacert.pem

SSL/Makefile.am mysql-test/Makefile.am:

2007-07-27 17:39:07 +02:00

client-cert.pem

SSL/Makefile.am mysql-test/Makefile.am:

2007-07-27 17:39:07 +02:00

client-key.pem

SSL/Makefile.am mysql-test/Makefile.am:

2007-07-27 17:39:07 +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

Bug#28916 LDML doesn't work for utf8

2007-06-07 17:55:55 +05:00

init_file.dat

Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as the date time

2007-02-19 14:57:54 +01:00

loaddata1.dat

…

loaddata2.dat

…

loaddata3.dat

…

loaddata4.dat

…

loaddata5.dat

Fix LOAD DATA to handle having the escape and enclosed-by character

2005-06-22 16:14:14 -07:00

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

Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes

2005-07-05 13:55:54 +02:00

master-bin.000001

…

Moscow_leap

…

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

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_loaddata2.dat

…

rpl_loaddata.dat

…

rpl_timezone2.dat

WL#1012: All changes as one single changeset.

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

rpl_timezone.dat

testing repl of timezone with LOAD DATA INFILE (hourra!)

2005-03-24 16:43:50 +01:00

server8k-cert.pem

Bug #29784 YaSSL assertion failure when reading 8k key.

2007-07-17 14:43:56 -04:00

server8k-key.pem

Bug #29784 YaSSL assertion failure when reading 8k key.

2007-07-17 14:43:56 -04:00

server-cert-des.pem

Bug#21868 Server crashes if encrypted certificate key provided

2006-09-25 16:44:15 +02:00

server-cert.pem

SSL/Makefile.am mysql-test/Makefile.am:

2007-07-27 17:39:07 +02:00

server-key-des.pem

Bug#21868 Server crashes if encrypted certificate key provided

2006-09-25 16:44:15 +02:00

server-key.pem

SSL/Makefile.am mysql-test/Makefile.am:

2007-07-27 17:39:07 +02:00

trunc_binlog.000001

fix rpl_trunc_binlog to test the new behaviour

2005-02-19 22:24:13 +01:00

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

…