tulin@build.mysql.com
16f77ce996
Merge build.mysql.com:/users/tulin/mysql-5.0
...
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-19 14:20:28 +01:00
gluh@gluh.mysql.r18.ru
994c1fd4d8
View field names should be case insensitive
2005-01-19 16:19:10 +03:00
joreland@mysql.com
2af06e0b32
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-19 07:37:42 +01:00
jimw@mysql.com
20552486e5
Fix test results from merge, and fix the symlink test which had an
...
out-of-sync test and result.
2005-01-18 15:05:16 -08:00
jimw@mysql.com
1edf7279ef
Merge from 4.1.
2005-01-18 13:59:55 -08:00
jimw@mysql.com
06f60f6d65
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-18 13:34:22 -08:00
Sinisa@sinisa.nasamreza.org
a2e0ecbf03
after merge fixes
2005-01-18 23:34:15 +02:00
Sinisa@sinisa.nasamreza.org
08639a88b2
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-01-18 23:29:47 +02:00
Sinisa@sinisa.nasamreza.org
477047401c
fixing wrong value for "examined rows" when UNION's are used.
2005-01-18 23:13:29 +02:00
jimw@mysql.com
2fac8bd044
Merge changed tests
2005-01-18 12:25:56 -08:00
dlenev@mysql.com
af878017b2
Merge mysql.com:/home/dlenev/src/mysql-4.1-merges
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-18 21:27:09 +03:00
jani@ua141d10.elisa.omakaista.fi
625ae2c5a0
Added possibility to use --error <name> instead of --error <number>
...
The old syntax works as well. WL#2356.
2005-01-18 20:16:21 +02:00
sergefp@mysql.com
a55f4a5da4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
2005-01-18 19:49:00 +03:00
dlenev@brandersnatch.localdomain
0787a97b1c
Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
...
prefix", which roots were fixed in 4.0 tree.
2005-01-18 17:45:49 +03:00
gluh@gluh.mysql.r18.ru
c965dc34cd
Fix for bug #7981 : SHOW GLOBAL STATUS crashes server
2005-01-18 17:37:45 +03:00
sergefp@mysql.com
d89166cd34
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
2005-01-18 16:46:26 +03:00
bar@mysql.com
b2dbddc39d
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-18 10:45:09 +04:00
bar@mysql.com
8f23e90232
#7874 : CONCAT() gives wrong results mixing latin1 field and utf8 string literals
...
We should not overwrite res if it is returned from a const item.
2005-01-18 10:42:29 +04:00
monty@mysql.com
9ad75d8c75
After merge fixes
2005-01-18 05:07:22 +02:00
jimw@mysql.com
a35c324358
Fix over-optimization that could result in an unsigned double field being
...
set to a negative value. (Bug #7700 )
2005-01-17 16:13:56 -08:00
timour@mysql.com
bb77b2e55f
Fix for BUG#7331 merged manually from 4.1.
2005-01-17 17:19:33 +02:00
timour@mysql.com
06fce173c0
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
2005-01-17 12:41:59 +02:00
sergefp@mysql.com
6303ca7efa
Fixes in opt_range.cc: ROR plan choice code
...
* Removed unused parameters
* Fixed several cost calculation errors in ror_intersect_add
* Better code structure for ror_intersect_add and get_best_ror_intersect
2005-01-17 00:18:19 +03:00
guilhem@mysql.com
05793bb9b9
Merge
2005-01-16 21:39:21 +01:00
monty@mysql.com
8d616390e9
After merge fixes
...
Fix for BIT(X) field as string
2005-01-15 17:38:43 +02:00
monty@mysql.com
3b0f8cabaf
Merge with global tree
2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f
Merge with 4.1
2005-01-15 14:09:45 +02:00
monty@mysql.com
a37e91e435
Changed interface for my_strntod() to make it more general and more portable
2005-01-15 12:28:38 +02:00
guilhem@mysql.com
09f36a69b9
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-15 10:21:50 +01:00
igor@rurik.mysql.com
cd577f2590
func_gconcat.result, func_gconcat.test:
...
Added a test case for bug #7769 .
item_sum.h:
Fixed bug #7769 : a crash for queries with group_concat and
having when the query table was empty.
The bug was due an unsafe dereferencing.
2005-01-15 01:05:00 -08:00
guilhem@mysql.com
5cafbb6838
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 14:23:34 +01:00
bar@mysql.com
71fe5f7e17
Bug#7284: strnxfrm generates different results for equal strings
...
additional fix for cp932 and eucjpms, recently implemented by
Shuichi.
2005-01-14 14:16:56 +04:00
guilhem@mysql.com
980d1b658e
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 10:59:37 +01:00
joreland@mysql.com
0dc477c58b
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-14 09:06:22 +01:00
dlenev@mysql.com
8be6787640
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-14 10:09:01 +03:00
monty@mysql.com
2204baa5a3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-14 00:10:03 +02:00
monty@mysql.com
7c457a1bd7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-13 20:09:41 +02:00
jimw@mysql.com
80c56602d3
Merge
2005-01-13 09:31:54 -08:00
jimw@mysql.com
7e1f47022c
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:24:07 -08:00
jimw@mysql.com
d63dc891c1
Add test cases to verify that SHOW CREATE TABLE always outputs the
...
key algorithm for keys where they were explicitly specified.
2005-01-13 18:22:35 +01:00
jimw@mysql.com
28ee2a67b3
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 09:09:10 -08:00
jimw@mysql.com
7639e5afaf
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:07:21 -08:00
konstantin@mysql.com
443cafc232
manual merge
2005-01-13 18:15:58 +03:00
guilhem@mysql.com
a02601ecc5
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-13 15:35:36 +01:00
konstantin@mysql.com
a676498977
manual merge
2005-01-13 17:31:49 +03:00
bar@mysql.com
e3d6e6736b
bug#7284: strnxfrm returns different results for equal strings
2005-01-13 18:12:04 +04:00
jani@ua141d10.elisa.omakaista.fi
9cea2457ec
Fixed a problem with a test. Time could be 0 or 1 seconds, depending
...
on whether running with or without valgrind.
2005-01-13 15:04:57 +02:00
dlenev@mysql.com
52baee6346
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-13 14:46:41 +03:00
joreland@mysql.com
19ef719912
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-13 11:35:12 +01:00
joreland@mysql.com
ca8a6d85ad
ndb - make sure to drop table at end ndb_update
2005-01-13 09:22:00 +01:00