msvensson@neptunus.(none)
45c5c105fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-26 20:25:33 +01:00
msvensson@neptunus.(none)
90e5ca96be
Look for and "convert" paths that start with $MYSQL_TMP_DIR
2006-02-26 19:54:09 +01:00
dlenev@mysql.com
4ca3409390
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-26 21:20:13 +03:00
dlenev@mysql.com
480dcb7f39
Fixed test for bug #13525 "Rename table does not keep info of triggers"
...
after merging fix for it with main tree.
2006-02-26 20:25:24 +03:00
dlenev@mysql.com
0b422c635d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-26 16:38:48 +03:00
monty@mysql.com
ab78d065ec
Merge monty@192.168.0.9:/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-02-25 17:48:09 +02:00
monty@mysql.com
54274976e7
Fixed compiler warnings from gcc 4.0.2:
...
- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers
2006-02-25 17:46:30 +02:00
monty@mysql.com
a7df038d16
Add back free that I accidently removed in last patch
2006-02-25 13:58:00 +02:00
monty@mysql.com
eff69e73a3
Fixed typo
2006-02-25 13:49:43 +02:00
monty@mysql.com
6fd52639c0
Merge monty@192.168.0.9:/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-02-25 13:26:05 +02:00
monty@mysql.com
dd1d40f8f8
Fixed new introduced bug in binlog.test with --ps-protocol
2006-02-25 13:24:18 +02:00
dlenev@mysql.com
0c15039e74
Fix for bug #13525 "Rename table does not keep info of triggers".
...
Let us transfer triggers associated with table when we rename it (but only if
we are not changing database to which table belongs, in the latter case we will
emit error).
2006-02-24 23:50:36 +03:00
monty@mysql.com
aa4128f811
Merge monty@192.168.0.9:/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-02-24 18:36:09 +02:00
monty@mysql.com
82b77cdd90
Fixes to embedded server to be able to run tests with it
...
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
evgen@moonbone.local
776b05ea43
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/17530-bug-5.0-mysql
2006-02-24 15:57:36 +03:00
knielsen@mysql.com
436587e997
Fix mysqldump.test to work with non-standard --vardir.
...
(Backported from mysql-5.1-new)
2006-02-24 13:51:04 +01:00
evgen@moonbone.local
bcff10f1fb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/17530-bug-5.0-mysql
2006-02-24 14:29:41 +03:00
konstantin@mysql.com
49ad134e9f
After-merge fixes (Bug#13134)
2006-02-24 00:12:04 +03:00
konstantin@mysql.com
90edf3720a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-02-24 00:09:47 +03:00
konstantin@mysql.com
af62c4a959
Merge mysql.com:/opt/local/work/mysql-4.1-13134
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-02-24 00:00:15 +03:00
konstantin@mysql.com
7178f247f5
Remove 'delayed' to make the test deterministic (already
...
fixed in 5.0).
A post-review fix (Bug#13134)
2006-02-23 23:41:15 +03:00
paul@snake-hub.snake.net
b11c033f49
mysqltest.c:
...
Rearrange out of order options in option struct.
2006-02-23 13:54:55 -06:00
paul@snake-hub.snake.net
f47ed62fb0
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-23 11:07:56 -06:00
paul@snake-hub.snake.net
b2529c2ab2
mysqld.cc:
...
Fix out of order entries in option struct.
2006-02-23 09:11:05 -06:00
msvensson@neptunus.(none)
36a1d6392b
Change snprintf to my_snprintf
2006-02-23 16:08:28 +01:00
konstantin@mysql.com
630869bc56
Cleanup.
2006-02-23 16:21:43 +03:00
msvensson@neptunus.(none)
269ab365aa
Aix52 build fix
2006-02-23 14:06:29 +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)
5c4bf37259
Merge fixup
2006-02-23 10:35:53 +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
aelkin@mysql.com
35861f3006
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug17265
2006-02-22 18:53:34 +02:00
aelkin@mysql.com
4155d1405e
BUG#17265 Assertion failure in rpl_row_view01.
...
To quote Timour review lines:
The actual cause of the bug is that sql_base.cc:setup_wild()
sets "select_lex->with_wild = 0" (in the end of the function) once
it expands all wild-cards, and wild-card expansion is done during
the prepare phase. During this phase we replace all "*" with the
corresponding items, which for views happen to be references to
references. When we do execute, select_lex->with_wild = 0, and
all "*" are already replaced by the corresponding items, which
in the case of views need to be dereferenced first.
Fixed by refining the assert. Regression test for the bug is rpl_row_view01,
as was reported.
2006-02-22 17:07:18 +02: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
timour@mysql.com
465745a200
Fix for BUG#17523: natural join and information schema.
...
The cause of the bug was an ASSERT that checked the consistency
of TABLE_SHARE::db and TABLE_LIST::db and failed for I_S tables.
The fix relaxes the requirement for consistency for I_S.
2006-02-22 10:04:10 +02: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
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
konstantin@mysql.com
442c2ba8af
A fix and a test case for Bug#13134 "Length of VARCHAR() utf8
...
column is increasing when table is recreated with PS/SP":
make use of create_field::char_length more consistent in the code.
Reinit create_field::length from create_field::char_length
for every execution of a prepared statement (actually fixes the
bug).
2006-02-21 19:52:20 +03: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
evgen@moonbone.local
e6924206cd
Fixed bug#17530: Incorrect key truncation on table creation caused server crash.
...
When a too long field is used for a key, only a prefix part of the field is
used. Length is reduced to the max key length allowed for storage. But if the
field have a multibyte charset it is possible to break multibyte char
sequence. This leads to the failed assertion in the innodb code and
server crash when a record is inserted.
The make_prepare_table() now aligns truncated key length to the boundary of
multibyte char.
2006-02-21 18:09:32 +03: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
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
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
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)
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)
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