jani@a193-229-222-105.elisa-laajakaista.fi
8f10662eab
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2005-07-23 00:15:53 +03:00
tulin@dl145b.mysql.com
8cea968418
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-22 23:15:51 +02:00
tulin@dl145b.mysql.com
97c1f885ed
ndb_partition_error.result:
...
corrected error code
2005-07-22 23:15:47 +02:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7cd1601b6e
Fixed error test case
2005-07-22 17:14:32 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64
Faster alter table code for 5.1.
2005-07-22 23:43:59 +03:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
2061b38e64
Bug #12114 patch
2005-07-22 16:39:05 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
56735c7ad7
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-07-22 15:27:30 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9229a99375
Bug #12097 More fixes
2005-07-22 15:17:05 -04:00
bar@mysql.com
daab2160a0
Merge mysql.com:/usr/home/bar/mysql-4.1.b11987
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-22 21:13:15 +05:00
bar@mysql.com
44a446dc07
ctype-gbk.c:
...
Bug #11987
mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
Allow to store and retrieve even unassigned GBK codes.
Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
new file
2005-07-22 21:06:02 +05:00
ndbdev@dl145b.mysql.com
e6d3d73ce0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-22 13:53:59 +02:00
bar@mysql.com
894dc2fdb0
Merge mysql.com:/usr/home/bar/mysql-4.1.b11754
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-22 14:47:13 +05:00
bar@mysql.com
4d75b059c0
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b11754
2005-07-22 13:27:30 +05:00
patg@radha.local
8d671d7bca
Applied and tested this patch successfully (bug 10431) to a clean
...
tree on brian's amd 64 box (which was already approved).
[patg@zim mysql-5.0]$ bk changes
ChangeSet@1.1882 , 2005-07-21 18:43:55+05:00, gluh@eagle.intranet.mysql.r18.ru
merge fix
Was the changeset level I applied this patch to.
Master shutdown finished
Slave shutdown finished
All 326 tests were successful.
[patg@zim mysql-5.0]$
2005-07-22 04:11:45 +02:00
ndbdev@dl145b.mysql.com
f5f56e4995
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-21 16:49:03 +02:00
gluh@eagle.intranet.mysql.r18.ru
c1c504abf4
merge fix
2005-07-21 18:43:55 +05:00
gluh@mysql.com
d0086f7db0
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-07-21 17:55:16 +05:00
bar@mysql.com
6a97af8a02
Bug#11216: 'show character set' describes latin1 incorrectly
...
Index.xml:
Fixing latin1 comment:
it is actually cp1252, not iso-8859-1
ctype_latin1.result:
changeing test results accordingly.
ctype-latin1.c:
Fixed to- and from-Unicode conversion maps
for better Unicode round trip of undefined
characters.
2005-07-21 16:05:19 +05:00
tulin@dl145b.mysql.com
c2c0cb18c3
no PARTITION in embedded server
2005-07-20 16:05:47 +02:00
tulin@dl145b.mysql.com
6176a4acf6
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 14:48:34 +02:00
tulin@dl145b.mysql.com
36fe10e531
moved all partition create table error tests to one test for easier maintenance
2005-07-20 14:46:02 +02:00
bar@mysql.com
8724c21bb3
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-20 13:40:18 +05:00
bar@mysql.com
8564322500
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.innolike
2005-07-20 11:00:33 +05:00
tulin@dl145b.mysql.com
bf6e3f9aa8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 07:53:10 +02:00
jimw@mysql.com
d4e0d60156
Clean up after merge of bug fixes
2005-07-19 19:59:36 -07:00
jimw@mysql.com
82a7a31cde
Merge mysql.com:/home/jimw/my/mysql-5.0-11954
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:35 -07:00
jimw@mysql.com
d7fbff3ec5
Merge mysql.com:/home/jimw/my/mysql-5.0-5906
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:34 -07:00
jimw@mysql.com
2a06e5756e
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:32 -07:00
evgen@moonbone.local
ef1d27e02a
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-bug-11760
2005-07-20 06:59:31 +04:00
evgen@moonbone.local
6b25219fea
Fix bug #11760 Typo in Item_func_add_time::print() results in NULLs returned
...
by subtime() in view
Item_func_add_time::print() were printing arg[0] instead of arg[1] which
results in wrongly created view. Functions addtime() and subtime were
affected by this bug.
2005-07-20 06:55:51 +04:00
jimw@mysql.com
63c6ece728
Cleanups after merge from 4.1.
2005-07-19 16:32:38 -07:00
tulin@dl145b.mysql.com
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
jimw@mysql.com
80c1c6b33f
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 11:05:49 -07:00
dlenev@mysql.com
8ad9af446b
After merge fix.
2005-07-19 21:38:12 +04:00
dlenev@mysql.com
b141437ad3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-tn
2005-07-19 20:55:09 +04:00
monty@mishka.local
292aefeeca
Fixed some test cases that was not forgotten in a recent patch
2005-07-19 19:47:54 +03:00
monty@mishka.local
29d9aa65f3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-07-19 19:28:26 +03:00
monty@mishka.local
7e83d09ce7
Simple fixes during review of new code
2005-07-19 19:25:05 +03:00
dlenev@mysql.com
8a3e723b74
Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch)
...
"Triggers have the wrong namespace"
"Triggers: duplicate names allowed"
"Triggers: CREATE TRIGGER does not accept fully qualified names"
"SHOW TRIGGERS"
2005-07-19 20:06:49 +04:00
bar@mysql.com
53478eb07f
ctype_utf8.result, ctype_utf8.test:
...
added test case
ctype-utf8.c:
bug#11754: SET NAMES utf8 followed by SELECT "A\\" LIKE "A\\" returns 0
2005-07-19 16:48:12 +05:00
gluh@eagle.intranet.mysql.r18.ru
d1bc1b7c0e
Fix for bug#11057 information_schema: columns table has some questionable contents
...
fixed BLOB, TEXT(wrong maximum length), BIT and integer types(wrong numeric_precision value)
2005-07-19 14:30:32 +05:00
gluh@eagle.intranet.mysql.r18.ru
d59ff2764c
Bug#11577 'show procedure/function status' doesn't work for user with limited access
...
changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines
2005-07-19 13:49:43 +05:00
jimw@mysql.com
c5b433c3b3
Fix default for sql_mode so that proc table is actually created
...
by mysql-test-run.pl. (Bug #11954 )
2005-07-18 18:36:48 -07:00
patg@radha.local
164255fc81
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0
2005-07-19 03:18:54 +02:00
patg@radha.local
e2d8644053
Eric's implentation of OPTIMIZE TABLE and REPAIR TABLE,
...
as well as changes to the test.
2005-07-19 03:04:51 +02:00
jimw@mysql.com
dd2f631ec4
Fix number to date conversion so it always honors the NO_ZERO_DATE,
...
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906 )
2005-07-18 16:12:44 -07:00
konstantin@mysql.com
52ba7b69d7
After-merge fixes.
2005-07-19 03:01:25 +04:00
konstantin@mysql.com
52b8928b09
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
...
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
shuichi@mysql.com
8e60817dda
Fixed the ucs2 -> eucjpms conversion bug (bug#11717)
2005-07-18 13:38:56 -07:00
evgen@moonbone.local
e75e566469
Merge moonbone.local:/work/mysql-4.1-bug-11868
...
into moonbone.local:/work/mysql-5.0-bug-11482
2005-07-18 19:37:42 +04:00