anozdrin@mysql.com
a77cc69e62
Fix for BUG#7787: Stored procedures: improper warning for "grant execute" statement.
...
The problem was that error flag was not reset.
2006-02-22 13:44:04 +03:00
msvensson@neptunus.(none)
47d8d129c3
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-22 10:59:28 +01:00
knielsen@mysql.com
da6e7e172f
Merge mysqldev@win2003-x86:my/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-02-22 10:19:45 +01:00
knielsen@mysql.com
49fda2c931
Merge mysql.com:/usr/local/mysql/mysql-5.1-varfix2
...
into mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-02-22 10:17:59 +01:00
knielsen@mysql.com
da296394e3
Fix test cases to work with non-standard --vardir.
...
Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to
separate stm/row test cases, the .opt were not moved along with it,
causing a 60-second test duration because of default lock timeout :-(
2006-02-22 10:07:54 +01:00
petr@mysql.com
8163afb43c
Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-race
...
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
2006-02-22 11:27:21 +03:00
mskold@mysql.com
f56016ee66
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-02-22 09:10:55 +01:00
msvensson@neptunus.(none)
3f39d25e93
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-22 08:55:19 +01:00
msvensson@neptunus.(none)
0f96360975
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-22 08:55:06 +01:00
vtkachenko@quadxeon.mysql.com
ab301016f2
myisamdef.h, mi_locking.c, mi_dynrec.c:
...
Fix insert performance with mmap
2006-02-22 08:32:58 +01:00
holyfoot@mysql.com
32da648789
Merge mysql.com:/home/hf/work/mysql-5.0.clean
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-02-22 10:53:44 +04:00
holyfoot@mysql.com
a94943df0c
Merge mysql.com:/home/hf/work/mysql-5.0.clean
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-02-22 10:33:42 +04:00
reggie@linux.site
cb10b77c31
BUG #15408 - Partitions: subpartition names are not unique
2006-02-21 17:40:07 -06:00
konstantin@mysql.com
f0abdf1ebe
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-02-22 01:20:47 +03:00
bpontz@mysql.com
2e82e5aef8
Fix the changelog entry header, format was wrong
2006-02-21 15:39:43 -05:00
jmiller@mysql.com
eafd514e1a
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-21 18:24:44 +01:00
joerg@mysql.com
89e71e83bf
configure.in (in the new clone):
...
This is a re-clone after tagging, so the version must be set back to 5.1.7-beta.
2006-02-21 18:24:28 +01:00
reggie@linux.site
336c0ba4cb
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1-bug15408
2006-02-21 10:29:41 -06:00
msvensson@neptunus.(none)
6efee6c42c
Merge neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 17:25:21 +01:00
msvensson@neptunus.(none)
e35e380072
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 17:21:21 +01:00
msvensson@neptunus.(none)
334b9c7a27
Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 17:19:46 +01:00
msvensson@neptunus.(none)
d722c5c60d
Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878
...
into neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878
2006-02-21 17:15:37 +01:00
msvensson@neptunus.(none)
b0b002e4f5
Bug#14354 Partitions: data directory clause fails
...
- Use "system" to execute rm, mkdir etc
- Use MYSQLTEST_VARDIR
2006-02-21 17:09:09 +01:00
msvensson@neptunus.(none)
d35ba92a24
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 15:57:56 +01:00
msvensson@neptunus.(none)
a699a2ea1b
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 15:05:58 +01:00
msvensson@neptunus.(none)
f64effb570
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
...
into neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
2006-02-21 15:03:15 +01:00
petr@mysql.com
ce4fd24da2
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-race
2006-02-21 15:59:41 +03:00
petr@mysql.com
cb5e54e1bd
Fix race condition: instance map wasn't locked for the
...
duration of the whole 'flush instances'. As a consequence,
it was possible to query instance map, while it is in the
inconsistent state. The patch was reworked after review.
2006-02-21 15:57:56 +03:00
mskold@mysql.com
043a16e34a
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-02-21 13:54:58 +01:00
msvensson@neptunus.(none)
e50d43b41a
Bug#14857 Reading dump files with single statement stored routines fails.Bug #14857 Reading dump files with single statement stored routines fails.
...
- Add tests, fixed by patch for 16878
2006-02-21 13:43:29 +01:00
petr@mysql.com
110032bdfc
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
2006-02-21 15:34:54 +03:00
petr@mysql.com
7146a9775e
Fix for Bug #12674 "Instance Manager: IM doesn't handle client
...
connections correctly".
Recommit with the max timeout value in sync with the comment.
2006-02-21 15:32:52 +03:00
msvensson@neptunus.(none)
c293324eb0
Bug#14871 mysqldump: invalid view dump output
...
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
2006-02-21 13:21:17 +01:00
svoj@april.(none)
b18f91ab7b
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/BUG17116/mysql-5.1-new
2006-02-21 16:20:02 +04:00
andrey@lmy004.
85236db1f1
disable tests. failures happen from time to time and stop people from
...
pushing. the code needs to be more stable.
2006-02-21 13:07:25 +01:00
msvensson@neptunus.(none)
8e760bc6cc
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
751d625865
Merge neptunus.(none):/home/msvensson/mysql/bug17382/my51-bug17382
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 09:28:36 +01:00
pekka@mysql.com
73d75104af
ndb - enable ndb_dd_backuprestore
2006-02-21 09:27:20 +01:00
pekka@mysql.com
dfa0a58014
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-21 09:27:19 +01:00
tomas@poseidon.ndb.mysql.com
37826388e0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-21 09:27:18 +01:00
tomas@poseidon.ndb.mysql.com
0bca0d435c
fixed test result on ndb_dd_restore whwas not done before
2006-02-21 09:25:50 +01:00
msvensson@neptunus.(none)
8e9d535676
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 09:11:59 +01:00
msvensson@neptunus.(none)
6006c9ac36
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:11:03 +01:00
msvensson@neptunus.(none)
3d1f99f8f9
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
...
into neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
2006-02-21 09:09:54 +01:00
msvensson@neptunus.(none)
dc41ef5f46
Merge neptunus.(none):/home/msvensson/mysql/bug16557/my51-bug16557
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 09:06:35 +01:00
msvensson@neptunus.(none)
7786d075e7
Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:58:19 +01:00
msvensson@neptunus.(none)
db9538c3bb
Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557
...
into neptunus.(none):/home/msvensson/mysql/bug16557/my51-bug16557
2006-02-21 08:57:18 +01:00
msvensson@neptunus.(none)
3764d3dab1
Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:55:13 +01:00
msvensson@neptunus.(none)
ac336241b3
Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
...
into neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795
2006-02-21 08:54:08 +01:00