Commit graph

10422 commits

Author SHA1 Message Date
andrey@lmy004.
fe426cae48 fix test result
fix for bug #16412 (post-merge fix)
2006-02-24 13:34:28 +01:00
andrey@lmy004.
a594cd080c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16412
2006-02-24 11:56:16 +01:00
andrey@lmy004.
c04b3f4a91 Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information)
WL#1034 (Internal CRON)
2006-02-24 11:52:03 +01:00
knielsen@mysql.com
97229ca7fc Fix mysqldump.test to work with non-standard --vardir. 2006-02-24 10:15:39 +01:00
msvensson@neptunus.(none)
33140311f1 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 16:10:36 +01:00
msvensson@neptunus.(none)
3fbf02d869 After merge fix 2006-02-23 10:57:33 +01:00
msvensson@neptunus.(none)
3ece1f3eda Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:54:56 +01:00
knielsen@mysql.com
630a8202be Fix bad merge 2006-02-23 10:51:33 +01:00
msvensson@neptunus.(none)
71ef9102c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-23 10:45:39 +01:00
msvensson@neptunus.(none)
8d78cd3e3c Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:41:37 +01:00
msvensson@neptunus.(none)
f80555880a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-23 10:30:31 +01:00
msvensson@neptunus.(none)
ec91a79c9f Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched. 2006-02-23 10:11:57 +01:00
knielsen@mysql.com
776dd75fac Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-02-23 09:07:30 +01:00
pekka@mysql.com
c9353db37d ndb - enable rpl_ndb_blob* again, disabled by accident 2006-02-23 00:35:32 +01:00
pekka@mysql.com
a2edc49ecd Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-22 23:18:45 +01:00
jmiller@mysql.com
3f61af3f28 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-22 23:12:32 +01:00
jmiller@mysql.com
28cbeb7374 rpl_row_mysqlbinlog.result, rpl_row_mysqlbinlog.test:
Updated with echos for the results file requested by lars
2006-02-22 23:11:42 +01:00
pekka@mysql.com
e4fd28a74f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-22 22:59:29 +01:00
pekka@mysql.com
5eed3319e9 ndb - ndb_restore.test: fix backup id in result 2006-02-22 22:04:46 +01:00
jmiller@mysql.com
5bed48392b New test for wl2321 2006-02-22 22:03:55 +01:00
kent@mysql.com
379ca816be Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-22 21:27:46 +01:00
reggie@linux.site
3de74e6237 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-02-22 14:18:45 -06:00
reggie@linux.site
6cea16a825 BUG# 17393: Partitions: Wrong error message when assigning too many subpartitions
We changed the error message to more clearly reflect the fact
that we are counting parts and subparts
2006-02-22 14:17:11 -06:00
kent@mysql.com
5d0187f0ae Makefile.am:
Change for 'make distcheck'
libmysqld.vcproj:
  Typo
2006-02-22 20:34:25 +01:00
konstantin@mysql.com
5d07195888 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-22 20:15:24 +03:00
jmiller@mysql.com
ef1b1e406f 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-22 15:50:26 +01:00
konstantin@mysql.com
a27e32b565 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-22 14:04:24 +03:00
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
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
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
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
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
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
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
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
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