holyfoot@mysql.com
1d71dece3e
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9527
2005-05-07 18:55:47 +05:00
gluh@mysql.com
64cbbf1463
Fix for bug #9838 : INFORMATION_SCHEMA.COLUMNS columns of granted views missing
2005-05-07 13:55:46 +00:00
gluh@mysql.com
a8febcd7d2
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897
2005-05-07 12:21:48 +00:00
gluh@mysql.com
d76be7ab3f
Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
...
thd->lex->derived_tables should be zero(it may be changed if we open a view)
2005-05-07 12:17:54 +00:00
holyfoot@hf-ibm.(none)
0dcb4707a0
Test case added for bug #9527 (negative zero is a nonsence)
2005-05-07 14:52:03 +05:00
holyfoot@hf-ibm.(none)
7ca35c2f66
Small fix for the test
2005-05-07 12:11:05 +05:00
holyfoot@mysql.com
fb37258872
Merge mysql.com:/home/hf/work/mysql-5.0.clean
...
into mysql.com:/home/hf/work/mysql-5.0.10004
2005-05-07 02:26:45 +05:00
ramil@mysql.com
e95d77c61d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/ram/work/mysql-5.0
2005-05-07 02:26:44 +05:00
gluh@mysql.com
a36ac81bd4
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.8998
2005-05-06 21:26:43 +00:00
gluh@mysql.com
f285b4fcee
Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
...
DEFAULT_COLLTION_NAME field is added to SCHEMATA table
2005-05-06 20:14:22 +00:00
holyfoot@mysql.com
3474ae5aac
merging
2005-05-06 20:31:50 +05:00
ramil@mysql.com
0316492d77
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/ram/work/mysql-5.0
2005-05-06 20:11:02 +05:00
ramil@mysql.com
def8eb631c
Merge mysql.com:/home/ram/work/mysql-4.1
...
into mysql.com:/home/ram/work/mysql-5.0
2005-05-06 20:11:01 +05:00
holyfoot@hf-ibm.(none)
ad863d40fa
Fix for bug #10004 (Decimal operation crashes server)
2005-05-06 20:06:25 +05:00
jani@ibmlab.site
56a98396ab
Fixed bugs 9820, 9799 and 9800.
2005-05-06 17:32:46 +03:00
holyfoot@hf-ibm.(none)
5aa0edf34c
Trimmed fix for bug #9546 (Crashing with huge decimals)
2005-05-06 19:04:58 +05:00
bar@noter.(none)
b20cac254c
Bug#6505 Wrong sorting order:
...
latin2_croatian_ci collation was fixed.
2005-05-06 18:41:41 +05:00
jani@ibmlab.site
0e91a7131f
Merge ibmlab.site:/home/my/bk/mysql-4.1
...
into ibmlab.site:/home/my/bk/mysql-5.0
2005-05-06 13:42:30 +03:00
bar@noter.(none)
59129d9bbe
bug#6504 Upper/Lower conversion bug:
...
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
2005-05-06 15:22:55 +05:00
ramil@ram-book.(none)
50579df606
A fix (bug #10404 : select 0/0 returns 0).
2005-05-06 13:31:48 +05:00
dlenev@mysql.com
917cb3dfbc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg9841
2005-05-06 11:18:37 +04:00
ramil@mysql.com
788678d392
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/ram/work/5.0
2005-05-06 11:48:55 +05:00
bar@mysql.com
b93385de8f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/root/mysql-5.0
2005-05-06 11:48:54 +05:00
ramil@mysql.com
802360fbc2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/ram/work/5.0
2005-05-06 08:34:50 +05:00
holyfoot@hf-ibm.(none)
8f3647005c
Tests and results fixed with last precision/decimal related modifications
2005-05-06 01:01:39 +05:00
shuichi@mysql.com
f0fb08dd79
Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
2005-05-05 10:46:14 -07:00
shuichi@mysql.com
720418fe46
Added cp932 character set
2005-05-05 10:36:17 -07:00
gbichot@quadita2.mysql.com
688d9ee03c
making rpl_sp.test hostname-independent
2005-05-05 18:28:54 +02:00
bar@noter.(none)
153b928c10
Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci
...
We cannot propagate constants with tricky collations.
2005-05-05 21:13:57 +05:00
dlenev@brandersnatch.localdomain
d60674d665
Fix for bug #9841 "Unexpected read lock when trying to update a view in
...
a stored procedure" (version 2).
To handle updates and inserts into view in SP properly we should set
lock types for tables of the view's main select when we are opening
view for prelocking purproses.
2005-05-05 19:49:15 +04:00
ram@ram-book.(none)
65f5a15a2d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ram-book.(none):/home/ram/work/5.0
2005-05-05 19:22:33 +05:00
gbichot@quadita2.mysql.com
d11607b08f
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-05 14:40:10 +02:00
konstantin@mysql.com
ca9aeb5707
Post merge fixes (merge of Bug#9777)
2005-05-05 16:31:18 +04:00
gbichot@quadita2.mysql.com
b72ae4fe57
Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
...
Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
Reason I don't propagate caller info to the binlog as planned is that on master and slave
users may be different; even with that some caveats would remain.
2005-05-05 14:20:53 +02:00
ramil@ram-book.(none)
b9ccbfd1f3
A fix (bug #10179 : error in default value setting).
2005-05-05 17:17:55 +05:00
konstantin@mysql.com
753959cd88
Manual merge
2005-05-05 13:47:09 +04:00
konstantin@mysql.com
15dbab1c12
A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it
...
should return a non empty one"
(see comments for the changed files for details).
2005-05-05 12:55:09 +04:00
konstantin@mysql.com
70a6d6c9de
Post-merge fixes for Bug#9096 "select doesn't return all matched
...
records if prepared statements is used" (see comments to
the changed files).
2005-05-04 16:53:10 +04:00
tulin@dl145b.mysql.com
ccac26a27a
logging_ok:
...
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
BUG#10287
2005-05-04 10:16:03 +02:00
konstantin@mysql.com
92e4e1a3f8
Manual merge of Bug#9096
2005-05-03 19:32:29 +04:00
konstantin@mysql.com
018b8025c0
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-4.1-9096-fresh
2005-05-03 12:49:22 +04:00
konstantin@mysql.com
3589e78fda
A fix and test case for Bug#9096 "select doesn't return all matched
...
records if prepared statements is used".
This fix changes equality evaluation method of basic constants from
by-name to by-value, thus effectively enabling use of parameter markers
in some optimizations (constants propagation, evaluation of possible
keys for query).
2005-05-03 12:47:27 +04:00
jimw@mysql.com
395e51a0ef
Update test results
2005-05-02 11:45:06 -07:00
jimw@mysql.com
36869043ec
Resolve merge of fix for #8166 .
2005-05-02 10:25:47 -07:00
jimw@mysql.com
5bd0fabd38
Merge mysql.com:/home/jimw/my/mysql-5.0-7293
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-02 10:20:54 -07:00
jimw@mysql.com
7bab94f36b
Clean up merge from 4.1
2005-05-02 10:19:37 -07:00
jimw@mysql.com
0b0e4f1166
Merge mysql.com:/home/jimw/my/mysql-4.1-9761
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:12:03 -07:00
jimw@mysql.com
2aea94f483
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:05:58 -07:00
serg@serg.mylan
530b6ba541
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-01 23:10:55 +02:00
monty@mysql.com
e721ec37ff
After merge fixes
2005-04-30 18:40:08 +03:00