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
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
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
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
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)
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
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)
e919f8e888
Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:50:26 +01:00
msvensson@neptunus.(none)
674ee5987c
Merge neptunus.(none):/home/msvensson/mysql/bug2845/my50-bug2845
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:44:27 +01:00
msvensson@neptunus.(none)
1119defd8f
Escape \ in "exec"
2006-02-20 15:03:16 +01:00
msvensson@neptunus.(none)
ae174fbef8
Fix typo
2006-02-20 12:05:45 +01:00
holyfoot@mysql.com
9d77d8d9fa
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.w2645
2006-02-20 14:29:50 +04:00
holyfoot@deer.(none)
796489ea1e
Messgges corrected in mysql_upgrade script
2006-02-20 14:26:32 +04:00
knielsen@mysql.com
4e378f7f72
Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-02-20 09:37:26 +01:00
knielsen@mysql.com
c15158e108
Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog,
...
fails with --vardir option.
2006-02-20 09:34:02 +01:00
igor@rurik.mysql.com
a3093f7e1e
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-19 17:26:06 -08:00
guilhem@mysql.com
32a5692733
In previous push, a DROP TABLE at the end of test was missing.
2006-02-18 21:08:41 +01:00
guilhem@mysql.com
37c1744a03
Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the original bug's title isn't the simplest
...
symptom). sys_var::check_set() was wrong. mysqlbinlog makes use of such SET SQL_MODE=N
(where N is interpreted like if SQL_MODE was a field of type SET), so
this bug affected recovery from binlogs if the server was running with certain SQL_MODE values,
for example the default values on Windows (STRICT_TRANS_TABLES); to work around this bug people
had to edit mysqlbinlog's output.
2006-02-18 17:32:15 +01:00
guilhem@mysql.com
56bed24c92
Fix for BUG#14769 "Function fails to replicate if fails half-way (slave stops)":
...
if the function, invoked in a non-binlogged caller (e.g. SELECT, DO), failed half-way on the master,
slave would stop and complain that error code between him and master mismatch.
To solve this, when a stored function is invoked in a non-binlogged caller (e.g. SELECT, DO), we binlog the function
call as SELECT instead of as DO (see revision comment of sp_head.cc for more).
And: minor wording change in the help text.
This cset will cause conflicts in 5.1, I'll merge.
2006-02-18 17:26:30 +01:00
guilhem@mysql.com
4c5d18b150
Fix for BUG#16559 "Replication Problems with Non transactional tables inside an interrupted trans.":
...
problem was: when a connection disconnects having an open transaction affecting MyISAM and InnoDB, the ROLLBACK event stored in the binary log
contained a non-zero error code (1053 because of the disconnection), so when slave applied the transaction, slave complained that its ROLLBACK succeeded
(error_code=0) while master's had 1053, so slave stopped. But internally generated binlog events such as this ROLLBACK
should always have 0 as error code, as is true in 4.1 and was accidentally broken in 5.0,
so that there is no false alarm.
2006-02-18 17:19:16 +01:00
holyfoot@deer.(none)
70fdbff94f
--help option added to mysql_upgrade script
2006-02-18 14:55:31 +04:00
petr@mysql.com
cb74e09f46
Add a shift in the parser. Forgotten in the previous commit.
2006-02-18 03:22:13 +03:00
petr@mysql.com
db7b6ef56f
Merge mysql.com:/home/cps/mysql/trees/5.0/mysql-5.0-virgin-debug
...
into mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
2006-02-18 02:50:50 +03:00
jimw@mysql.com
7182785f19
Fix subselect results (there was a bad merge when subselect test was disabled)
2006-02-17 10:02:59 -08:00
jimw@mysql.com
38aafce1ef
Merge mysql.com:/home/jimw/my/mysql-5.0-14676
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-02-17 08:32:50 -08:00
paul@snake-hub.snake.net
abe3dd2a7e
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-17 08:38:05 -06:00
paul@snake-hub.snake.net
22f630f59a
mysqlcheck.c:
...
Tweak --check-upgrade help text.
2006-02-17 08:32:52 -06:00
evgen@moonbone.local
e115d605de
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15706-bug-5.0-mysql
2006-02-17 15:36:56 +03:00
msvensson@neptunus.(none)
c8c579b2e5
Set opt_vardir_trace for path for tracefiles
2006-02-17 12:19:05 +01:00
msvensson@neptunus.(none)
b951068d62
Replace win filename s with unix equivalent
...
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.
2006-02-17 12:07:45 +01:00