Sinisa@sinisa.nasamreza.org
256e0a4017
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sinisa.nasamreza.org:/mnt/work/petica
2005-03-17 19:33:08 +02:00
Sinisa@sinisa.nasamreza.org
8bbb282b5d
sp.test:
...
Fix for a bug with test failing with Classic.
2005-03-17 19:26:36 +02:00
brian@zim.(none)
d713011627
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-03-17 08:17:36 -08:00
joerg@mysql.com
3ea0d8806d
Manual merge.
2005-03-17 16:44:25 +01:00
gluh@gluh.mysql.r18.ru
edb4dd5366
after merge fix
2005-03-17 18:44:24 +03:00
gluh@gluh.mysql.r18.ru
b435d6e862
Merge 4.1 -> 5.0
2005-03-17 16:51:07 +03:00
gluh@gluh.mysql.r18.ru
08b2c7ecca
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-17 13:25:19 +03:00
gluh@gluh.mysql.r18.ru
84cb408445
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-17 11:02:11 +03:00
serg@serg.mylan
41997cf263
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-17 08:46:48 +01:00
ramil@mysql.com
261105a007
Merge
2005-03-17 10:59:25 +04:00
ramil@mysql.com
a773916238
A fix (bug #8942 : SUBSTRING_INDEX in UPDATE causes internal loop).
2005-03-17 10:24:50 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fbb61754b
Fixed two bugs in MySQL ACL.
...
First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.
Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)
Fixed tests grant.pl and grant2, which were wrong.
2005-03-17 08:16:56 +02:00
brian@zim.(none)
f5d0a23788
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-03-16 18:04:28 -08:00
igor@rurik.mysql.com
3103b4cae5
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-03-16 17:50:03 -08:00
brian@zim.(none)
473e1ffd3a
Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup).
2005-03-16 16:22:56 -08:00
igor@rurik.mysql.com
45ba13889d
olap.result, olap.test:
...
Added a test for bug #8615 .
sql_select.cc:
Fixed bug #8615 .
This fix only removed the cause of the reported crash.
It does not resolve other problems of rollup queries
with DISTINCT. They were fixed in the previous patch
for bug 8616.
2005-03-16 15:55:04 -08:00
monty@mysql.com
ddec400e18
Merge with global tree
2005-03-17 01:27:04 +02:00
monty@mysql.com
aa6ab3b49c
Move handler dependent tests to the specific handler (myisam, bdb, innodb)
...
Enabled VARCHAR testing for innodb
NOTE: innodb.test currently fails becasue of a bug in InnoDB.
I have informed Heikki about this and expect him to fix this ASAP
2005-03-17 01:22:12 +02:00
lars@mysql.com
155f8ff82d
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1
2005-03-16 23:44:47 +01:00
monty@mysql.com
f42941073d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-16 22:59:06 +02:00
lars@mysql.com
fc6eda1336
Fixes after Sinisa and Serg comments after push of patch for BUG#9123.
...
BUG#9123 is solved earlier than this patch though.
2005-03-16 21:56:56 +01:00
patg@krsna.
2f47e3e132
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 12:56:40 -08:00
dlenev@brandersnatch.localdomain
d8d507926d
Fixed binlog.test failure which occured after patch implementing
...
WL#874 "Extended LOAD DATA" was pushed.
2005-03-16 23:12:27 +03:00
patg@krsna.
dcf73493df
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 12:05:58 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
d6c893bb1c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
2005-03-16 16:57:59 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
4e0b462612
Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.2
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
2005-03-16 16:27:07 +00:00
heikki@hundin.mysql.fi
4bf1d9e445
data0data.c:
...
Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing
2005-03-16 18:05:08 +02:00
joerg@mysql.com
9d0b81880c
Manual merge: Do not re-use the same identifier at loop level within a function (IRIX!).
2005-03-16 17:05:07 +01:00
patg@krsna.
8e376b37d5
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 07:55:56 -08:00
dlenev@brandersnatch.localdomain
357abac3a4
Small fix to innodb.test that Heikki probably simply forgot to commit.
2005-03-16 18:48:13 +03:00
joerg@mysql.com
29a78e7e88
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2005-03-16 16:44:31 +01:00
joerg@mysql.com
ea5899a65d
Add information to the log file written by 'Do-compile' that allows to calculate
...
the time spent in the various steps.
2005-03-16 16:33:06 +01:00
gluh@gluh.mysql.r18.ru
cb29afef03
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-16 18:09:01 +03:00
gluh@gluh.mysql.r18.ru
a93db6c052
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-16 17:37:28 +03:00
dlenev@mysql.com
5f5203b357
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
2005-03-16 17:14:08 +03:00
monty@mysql.com
594ef41b2d
Cleanup during reviews
...
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02:00
dlenev@mysql.com
8df3d5b098
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
2005-03-16 17:00:13 +03:00
monty@mysql.com
a085653331
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-03-16 15:44:31 +02:00
lars@mysql.com
0997684f96
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bkroot/mysql-4.1
2005-03-16 14:44:30 +01:00
bar@mysql.com
a7b877df78
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
...
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for
debugging purposes.
2005-03-16 17:44:29 +04:00
lars@mysql.com
65d88538d3
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bkroot/mysql-4.1
2005-03-16 14:44:29 +01:00
gluh@gluh.mysql.r18.ru
41487d0b4e
Fix for bug#8656: Crash with group_concat on alias in outer table
...
fixed result_field support of Item_ref
2005-03-16 16:44:28 +03:00
monty@mysql.com
265270b970
Fix to get --skip-ndb to work
2005-03-16 15:32:43 +02:00
heikki@hundin.mysql.fi
dacb591222
subselect2.result:
...
Update key lengths in EXPLAIN to reflect true VARCHARs
2005-03-16 15:26:07 +02:00
heikki@hundin.mysql.fi
9975f53359
ha_innodb.cc:
...
Fix bug: InnoDB created all indexes on true VARCHARs as column prefix keys because field->pack_length() for a true VARCHAR is bigger than key_part->length; FOREIGN KEYs could not be created on true VARCHARs then
2005-03-16 15:18:14 +02:00
lars@mysql.com
52f190c098
BUG#9123: Updates after Mats review
2005-03-16 13:57:59 +01:00
lars@mysql.com
529f9db996
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bkroot/mysql-4.1
2005-03-16 13:57:58 +01:00
gluh@gluh.mysql.r18.ru
4c3e8b078c
Fix for bug #7100 : relay_log_space_max missing from SHOW VARIABLES
2005-03-16 15:57:57 +03:00
heikki@hundin.mysql.fi
cb88409e07
data0type.h, row0sel.c:
...
Fix a crash in a simple search with a key: the dtype->len of a true VARCHAR is the payload maximum len in bytes: it does not include the 2 bytes MySQL uses to store the string length
ha_innodb.cc:
Fix a crash in true VARCHARs in test-innodb: we passed a wrong pointer to the column conversion in an UPDATE
rowid_order_innodb.result, ps_3innodb.result, innodb.result, endspace.result:
Edit InnoDB test results to reflect the arrival of true VARCHARs
2005-03-16 14:28:54 +02:00
gluh@gluh.mysql.r18.ru
465500b463
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-16 15:02:39 +03:00