joreland@mysql.com
e148567003
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-01 04:55:16 +02:00
monty@mysql.com
054cea4ca8
Merge with 4.0
2004-09-01 04:12:09 +03:00
monty@mysql.com
ba4d4ce97a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-09-01 02:13:35 +03:00
bell@sanja.is.com.ua
b02451c5bd
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-not-4.1
2004-08-31 21:11:54 +03:00
bell@sanja.is.com.ua
2cf1234ba2
after review patch
2004-08-31 21:10:57 +03:00
mskold@mysql.com
ae801bad8d
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 15:53:28 +02:00
monty@mysql.com
7abae83300
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-31 16:53:25 +03:00
monty@mysql.com
6adaff23a4
Review of new pushed code (Indentation fixes and simple optimizations)
...
Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files
2004-08-31 14:35:04 +03:00
sergefp@mysql.com
e4ffae2a0e
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames
2004-08-31 14:12:42 +04:00
mskold@mysql.com
84196617c1
Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert
2004-08-31 12:07:48 +02:00
bell@sanja.is.com.ua
771c2998ed
ORDER clause printing fixed (BUG#5156)
2004-08-31 11:58:45 +03:00
mskold@mysql.com
b0bac7d1e0
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 10:20:51 +02:00
mskold@mysql.com
4f8a82dbfe
Enabled HA_NULL_IN_KEY support
2004-08-31 10:19:10 +02:00
mskold@mysql.com
4b1671c933
Simplified expensive test
2004-08-31 10:00:33 +02:00
bell@sanja.is.com.ua
392c306969
fixed open_and_lock_tables result processing (all open_and_lock_tables revision)
...
fixed printing of COLLATE operation
(BUG#5155)
2004-08-31 10:06:38 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
7ee2f2c6bb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/mysql-5.0
2004-08-30 22:11:14 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
203debc666
Fix column name where it starts with a backtick
2004-08-30 22:08:51 +01:00
bell@sanja.is.com.ua
7682b10ee8
fixed case when real length very close to calculated (BUG#5150)
2004-08-30 22:52:50 +03:00
bell@sanja.is.com.ua
a43c40f10f
fixed printing of stored procedure functions names (BUG#5149)
2004-08-30 21:47:52 +03:00
timour@mysql.com
61eff52d23
added test for BUG#3759
2004-08-30 18:14:29 +03:00
serg@serg.mylan
49d49e2fcb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-30 16:32:10 +02:00
serg@serg.mylan
994d648dda
space-stripping in _mi_prefix_search: BUG#5284
2004-08-30 16:12:53 +02:00
pem@mysql.comhem.se
12b1c4b330
Fixed BUG#5279: Stored procedure packets out of order if CHECKSUM TABLE.
2004-08-30 14:52:21 +02:00
lenz@mysql.com
9632f7d9c8
- removed mysql-test/t/flush_block_commit-master.opt as it collided
...
with the sleep value we use for the test suite run during the
release builds
2004-08-30 09:20:52 +02:00
sergefp@mysql.com
3dfbc35f45
Fix for BUG#5242: Made SQL Syntax Prepared Statement names case-insensitive.
2004-08-29 19:44:28 +04:00
monty@mysql.com
f574cd4e8f
Code style fixes.
...
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
2004-08-28 00:49:54 +03:00
joreland@mysql.com
6af42cfba4
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-27 19:36:54 +02:00
joreland@mysql.com
cca01b0191
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 19:02:46 +02:00
bar@mysql.com
b604164599
Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict
2004-08-27 20:48:19 +05:00
bar@mysql.com
e8fcc297e1
grant.result:
...
Forgot to push in the previous changeset
2004-08-27 20:48:18 +05:00
pem@mysql.comhem.se
f723438555
Fixed BUG#5251: mysql changes creation time of a procedure/function when altering.
2004-08-27 16:41:34 +02:00
timour@mysql.com
e2cd3dd1ce
WL#1724 "Min/Max Optimization for Queries with Group By Clause"
...
- after-review changes
- merged with the source tree from 204-08-27
2004-08-27 16:37:13 +03:00
joreland@mysql.com
f33207ac8d
Fix order by
2004-08-27 14:15:47 +02:00
joreland@mysql.com
af7c3008db
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-27 14:11:50 +02:00
tomas@poseidon.(none)
698511bfe4
small fixes
2004-08-27 12:11:49 +00:00
joreland@mysql.com
e85ce08901
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 14:02:02 +02:00
ram@gw.mysql.r18.ru
3acccb988a
A fix (Bug #5232 : CREATE TABLE ... SELECT can deadlock itself).
2004-08-27 16:43:01 +05:00
bar@mysql.com
10b88b37b7
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-27 15:56:27 +05:00
bar@mysql.com
b10dcf7aa6
grant.result:
...
Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.
2004-08-27 15:55:16 +05:00
bell@sanja.is.com.ua
508fb5aa12
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-08-27 07:59:30 +03:00
joreland@mysql.com
6df66180bd
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 01:01:47 +02:00
joreland@mysql.com
95e5b457b8
Fix ordered index scan with partially specified key
2004-08-27 00:59:16 +02:00
bell@sanja.is.com.ua
7e446b8349
Item name for VIEW added to find_field_in_table (BUG#5147)
2004-08-27 00:08:59 +03:00
serg@serg.mylan
acbf96a161
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:49:16 +02:00
monty@mysql.com
ceba1429b7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-26 18:27:33 +03:00
monty@mysql.com
ea687ba5da
Portability fixes
...
Fixed bug in end space handle for WHERE text_column="constant"
2004-08-26 18:26:38 +03:00
tomas@poseidon.(none)
50cee6abc8
ndb cluster config fixes, se respective files
2004-08-26 14:35:33 +00:00
serg@serg.mylan
b4bb38e896
merged
2004-08-26 15:19:46 +02:00
ram@gw.mysql.r18.ru
2a29cb0204
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
2004-08-26 16:54:33 +05:00
ram@gw.mysql.r18.ru
2133721ac6
A fix (Bug#5219: Cannot use '||' with MBRContains(..)).
2004-08-26 16:51:26 +05:00