holyfoot@deer.(none)
55e7f4503e
bug #15521 (Cannot reorganise a partition with a new name equal to the old name)
2005-12-15 15:24:35 +04:00
knielsen@mysql.com
b2999daba2
Merge mysql.com:/usr/local/mysql/mysql-5.0-merge
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2005-12-15 09:52:11 +01:00
kent@mysql.com
28a59073b0
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-12-15 00:43:41 +01:00
joerg@trift-lap.fambruehe
7e36dc1cc6
Merge joerg@trift2:/M50/part2-ramil
...
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
2005-12-14 23:05:08 +01:00
joerg@trift-lap.fambruehe
81df985a6a
Merge trift-lap.fambruehe:/MySQL/M51/part1-kent-knielsen
...
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
2005-12-14 21:39:17 +01:00
ramil@mysql.com
04cff0d055
Fix for bug #15623 : Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
...
and bug #15668 : Test 'sp-error' crashes server on Mac OS X.
2005-12-14 21:42:08 +04:00
kent@mysql.com
8e5b353598
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 16:50:28 +01:00
mskold@mysql.com
138ec21cc9
Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable
2005-12-14 16:29:56 +01:00
aivanov@mysql.com
c6f658d09e
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28
2005-12-14 18:08:56 +03:00
jonas@perch.ndb.mysql.com
2059a6c174
bug#15682 - ndb
...
incorrect handling of varchar in position/rnd_pos
Commit for 5.0.17 release clone
2005-12-14 15:09:12 +01:00
mskold@mysql.com
0663f81acd
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-12-14 14:49:59 +01:00
mskold@mysql.com
973dedbf08
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:48:42 +01:00
mskold@mysql.com
c08ee431bd
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:46:24 +01:00
mskold@mysql.com
b0500f54c8
Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable
2005-12-14 14:45:13 +01:00
kent@mysql.com
c11b35d9bf
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:18:24 +01:00
kent@mysql.com
45b81ac196
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:09:41 +01:00
andrey@lmy004.
fd0613f59e
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2005-12-14 12:15:48 +01:00
jonas@perch.ndb.mysql.com
6a02895276
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-12-14 11:34:08 +01:00
jani@hundin.mysql.fi
b846c5463b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into hundin.mysql.fi:/home/jani/mysql-5.1-new
2005-12-14 12:32:58 +02:00
jonas@perch.ndb.mysql.com
4454e7a631
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-14 11:06:40 +01:00
jonas@perch.ndb.mysql.com
1864165ff3
bug#15682 - ndb - invalid handling of varchar in position/rnd_pos
2005-12-14 10:57:09 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
2ed8d82c61
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-14 09:42:05 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
f845256f89
Disabled test. Fails in ps-protocol mode.
2005-12-14 02:56:34 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
37010dba85
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-14 01:38:10 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4ac4020f6d
Fixed test case.
2005-12-14 00:23:46 +02:00
evgen@moonbone.local
012933ce39
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15268-bug-5.0-mysql
2005-12-13 23:26:35 +03:00
aivanov@mysql.com
11073be8d0
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
2005-12-13 22:29:36 +03:00
aivanov@mysql.com
2e499986aa
Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for
...
table' lockup".
Changes from the innodb-5.0-ss92 snapshot.
Do not call os_file_create_tmpfile() at runtime. Instead, create
all tempfiles at startup and guard access to them with mutexes.
2005-12-13 21:35:24 +03:00
msvensson@neptunus.(none)
b38a183d62
Remove confusing printouts from expected to fail "system" commands
2005-12-13 18:47:34 +01:00
msvensson@neptunus.(none)
36c86a4df6
Fix tests after merge
...
Straighten out and comment behaviour for --require and --result in run_query
2005-12-13 18:07:13 +01:00
jonas@perch.ndb.mysql.com
530e22edbf
Bug#15675 - ndb - fix read_multi_range.test drop all tables it using
...
NOTE: only changes to test script
2005-12-13 17:33:19 +01:00
msvensson@neptunus.(none)
2dbb3bc2ef
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2005-12-13 15:14:18 +01:00
aivanov@mysql.com
124b76c5a8
Changes from the innodb-5.1-ss28 snapshot.
...
Removed include/Makefile.am and the reference to it.
Deleted db/db0err.h and db directory.
Check index column sizes in a better way (bug 13315).
Fixed comments for memory allocation functions and added
some extra checks. Adapted callers.
2005-12-13 16:49:24 +03:00
pem@mysql.com
1d83ff5b98
Added bug synopsis in comment for sp.test case BUG#15231.
2005-12-13 13:22:15 +01:00
pem@mysql.com
9945144499
Fixed BUG#15231: Stored procedure bug with not found condition handler
...
Make the distinction between "exception conditions" and "completion
conditions" (warning and "no data") as defined by the standard. The latter
should not terminate a routine if no handler is found in the lexical scope.
2005-12-13 13:12:42 +01:00
knielsen@mysql.com
c1551bf94d
BUG#15624: Use --real_sleep in rpl_deadlock.test to avoid breaking when run with --sleep.
2005-12-13 11:42:10 +01:00
jimw@mysql.com
e36df26e5b
Fix sp.result after merge
2005-12-12 14:53:47 -08:00
jimw@mysql.com
00d29cd259
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-12 11:57:07 -08:00
aivanov@mysql.com
75af3821d7
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
2005-12-12 22:46:49 +03:00
jimw@mysql.com
90befc0a0e
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:39:33 -08:00
jimw@mysql.com
e18679c7ff
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 10:11:56 -08:00
joerg@mysql.com
2a3d35fa02
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-12-12 19:11:21 +01:00
aivanov@mysql.com
7ae2d46903
Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for
...
table' lockup".
Changes from the innodb-4.1-ss11 snapshot.
Do not call os_file-create_tmpfile() at runtime. Instead, create
a tempfile at startup and guard access to it with a mutex.
Also, fix bugs:
10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
datatypes between foreign key references are compatible.
Also, added test cases (also for bug 9802).
2005-12-12 21:06:59 +03:00
joerg@mysql.com
a86cb213f2
Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/bug12429
2005-12-12 19:04:47 +01:00
joerg@mysql.com
99cf03b295
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
...
into mysql.com:/M50/clone-5.0
2005-12-12 19:00:08 +01:00
joerg@mysql.com
36655f9a1e
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429
2005-12-12 18:54:35 +01:00
joerg@mysql.com
c256d035dd
Merge mysql.com:/M50/bug12429 into mysql.com:/M51/merge-5.1
2005-12-12 18:50:00 +01:00
joerg@mysql.com
fd77b58ee8
Merge mysql.com:/M50/bug12429 into mysql.com:/M50/clone-5.0
2005-12-12 18:44:01 +01:00
bar@mysql.com
9ac6e558d4
Bug#15375 Unassigned multibyte codes are broken
...
into parts when converting to Unicode.
m_ctype.h:
Reorganizing mb_wc return codes to be able
to return "an unassigned N-byte-long character".
sql_string.cc:
Adding code to detect and properly handle
unassigned characters (i.e. the those character
which are correctly formed according to the
character specifications, but don't have Unicode
mapping).
Many files:
Fixing conversion function to return new codes.
ctype_ujis.test, ctype_gbk.test, ctype_big5.test:
Adding a test case.
ctype_ujis.result, ctype_gbk.result, ctype_big5.result:
Fixing results accordingly.
2005-12-12 21:42:09 +04:00
joerg@mysql.com
62d726582e
rpl_until.test + rpl_until.result Fix (completion) for bug#12429
...
Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com ) to two other places.
2005-12-12 18:00:37 +01:00