konstantin@mysql.com
cce3acfa16
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-12-05 01:29:20 +03:00
serg@serg.mylan
cbcb863ca5
test result fixed
2003-12-04 23:18:04 +01:00
guilhem@mysql.com
c87747c39c
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-04 22:44:13 +01:00
guilhem@mysql.com
dd2303ce07
- Fix for BUG#1858 "SQL-Thread stops working when using optimize table":
...
we change THD::system_thread from a 'bool' to a bitmap to be able to
distinguish between delayed-insert threads and slave threads.
- Fix for BUG#1701 "Update from multiple tables" (one line in sql_parse.cc,
plus a new test rpl_multi_update.test). That's just adding an initialization.
2003-12-04 22:42:18 +01:00
serg@serg.mylan
b193d20001
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-04 22:07:04 +01:00
konstantin@mysql.com
a8c811e2db
Merge mysql.com:/home/kostja/mysql/mysql-4.0-root
...
into mysql.com:/home/kostja/mysql/mysql-4.0-1790
2003-12-05 00:00:02 +03:00
serg@serg.mylan
3f1d0acbad
make a clear distinction between max_word_length in *characters* and in *bytes*
2003-12-04 21:58:28 +01:00
greg@mysql.com
5217a5e8fc
Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/bk/mysql-4.0
2003-12-04 13:59:12 -05:00
greg@mysql.com
5af1c00a1d
Fix InstallShield 'String Tables could not be loaded' issue
2003-12-04 13:58:21 -05:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1f02484341
Fixup error number - Broke during merge
2003-12-04 18:09:36 +00:00
monty@mysql.com
f3e1d9c6ca
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/my/mysql-4.0
2003-12-04 19:48:35 +02:00
monty@mysql.com
e36fd28447
Allow space in service names
...
move bdb/innodb tests to right places
2003-12-04 19:48:10 +02:00
greg@mysql.com
b83f2bd350
Merge gweir@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/bk/mysql-4.1
2003-12-04 11:54:53 -05:00
greg@mysql.com
66f777d36c
Add charset #defines for Windows platform (as of 4.1.1)
2003-12-04 11:54:04 -05:00
konstantin@oak.local
bab592c3c0
comment to user-level lock added
2003-12-04 19:12:01 +03:00
dlenev@mysql.com
01ecc1d72a
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-tsbug
2003-12-04 19:03:20 +03:00
dlenev@mysql.com
e4d2cbc0da
Fix undeterministic behaviour of year check
...
if we failed to classify integer as datetime
in Field_datetime::store().
Stylistic clean-ups.
2003-12-04 19:02:48 +03:00
guilhem@mysql.com
ae67b97c4b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-04 15:31:14 +01:00
guilhem@mysql.com
1b4bd22bd7
Fix for BUG#2011 "rare race condition producing "binlog has bad magic number" error in slave".
...
The problem was that when the slave SQL thread reads a hot relay log (hot = the one being written to by the
slave I/O thread), it must have the LOCK_log. It already took it for read_log_event(), but needs
it also for check_binlog_magic().
This should fix all recently reported failures of the rpl_max_relay_size test in 4.1 and 5.0
(though the bug exists since 4.0, it showed up first in 5.0).
2003-12-04 15:30:14 +01:00
lenz@kallisto.local
84acc2054f
- Bumped up version number in configure.in 4.1.1-alpha -> 4.1.2-alpha
...
- tagged ChangeSet 1.1641 as "mysql-4.1.1"
2003-12-04 15:20:44 +01:00
gluh@gluh.mysql.r18.ru
132537accb
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.bugfssl
2003-12-04 14:16:32 +04:00
gluh@gluh.mysql.r18.ru
d626c313e5
Fix for bug#1944 'Function RPad() sometimes produce unexpected result'
2003-12-04 14:12:01 +04:00
paul@ice.snake.net
93f84357c0
README:
...
minor edits
2003-12-03 21:10:44 -06:00
paul@teton.kitebird.com
400f3076aa
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-03 12:10:27 -06:00
paul@ice.snake.net
96ff6cde3f
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2003-12-03 11:51:57 -06:00
paul@ice.snake.net
5d323303cb
Delete obsolete references.
2003-12-03 11:48:34 -06:00
sergefp@mysql.com
fb7cd7eab2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/psergey/mysql-4.0
2003-12-03 20:12:47 +03:00
sergefp@mysql.com
70ff7b8254
Fix for bug #1980 tests
2003-12-03 19:49:31 +03:00
paul@teton.kitebird.com
e3624ee6d1
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-03 07:53:38 -06:00
lenz@mysql.com
53aa633b24
- Bugfix for the Mac OS X startup script: Suppress the annoying
...
"$1: unbound variable" error when no option was given
2003-12-03 13:56:33 +01:00
lenz@mysql.com
6cd58f43b5
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2003-12-03 11:07:02 +01:00
paul@ice.snake.net
fa432b3d79
benchmarks README edits
2003-12-02 18:14:56 -06:00
guilhem@mysql.com
33b9016d31
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-02 23:33:00 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
55d4248dae
Merge for update
2003-12-02 20:57:34 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
afc619f0a2
WorkLog#1280 - Remove fixed table handler from lex/yacc
2003-12-02 20:23:13 +00:00
sergefp@mysql.com
801126c60b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/psergey/mysql-4.0
2003-12-02 21:16:57 +03:00
sergefp@mysql.com
486415233e
Fix for bug #1980
2003-12-02 21:05:40 +03:00
dlenev@mysql.com
0add961061
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-tsbg
2003-12-02 20:30:10 +03:00
dlenev@mysql.com
dd37ef055b
Fix for Bug #1448 "Date parsing fails, and fails to complain
...
about it". Now numbers representing illegal timestamps are
converted to 0 value if they are stored as timestamp or
datetime. This behaviour is consistent with manual and with
behaviour of string -> timestamp conversion.
2003-12-02 20:25:45 +03:00
konstantin@mysql.com
cf192063d1
Post-review fixes for bug #1790 'BIT_AND() result in GROUP BY different when
...
SQL_BIG_RESULT used':
- BIT_AND now returns BIGINT UNSIGNED
- in case there were no matching rows BIT_AND returns 18446744073709551615
(but not NULL), BIT_OR returns 0 (but not NULL). That's how Monty wants it
and how is described in our docs.
2003-12-02 19:39:51 +03:00
guilhem@mysql.com
7eda171f9a
There is no reason that Intvar_log_event's constructor calls Log_event::Log_event()
...
instead of Log_event::Log_event(THD*, ...) when the event is built in the master
to be written in the binlog.
Rand_log_event already used the good constructor, so there really is no reason
for Intvar_log_event to be an exception.
This fixes a test failure of last night (which appeared after I removed a useless
e.server_id=thd->server_id in log.cc; in fact this line was not useless because
it hid the bad constructor).
Replication tests pass, with Valgrind too.
2003-12-02 16:49:46 +01:00
konstantin@mysql.com
1be4a37fa2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-02 18:06:25 +03:00
hf@deer.(none)
02f382ecaa
Fix for #1189 (Mess with names about CONSTRAINT)
...
Second edition: error message was deleted as Segey suggested
Now name of the constraint will be used as the name of the key
if the last not specified
2003-12-02 19:06:24 +04:00
konstantin@mysql.com
21b506ba21
Merge mysql.com:/home/kostja/mysql/mysql-4.0-root
...
into mysql.com:/home/kostja/mysql/mysql-4.0-1790
2003-12-02 18:04:00 +03:00
lenz@kallisto.local
80deee256c
- removed INSTALL-WIN-SOURCE from the BK tree as its content has been
...
added to manual.texi - extract it from there instead.
2003-12-02 15:56:18 +01:00
konstantin@oak.local
c10413abda
Item_param::save_in_field():
...
thd->command can be anything except COM_EXECUTE in no cases
except programming error.
2003-12-02 15:09:35 +03:00
monty@mysql.com
05e4d9031b
Ensure that innodb is created for the first replication test as the slave-timeout is lower for future tests and this failed on some slower machines
2003-12-02 13:32:05 +02:00
konstantin@mysql.com
f274f72c98
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-02 13:10:25 +03:00
igor@rurik.mysql.com
dcbbbe6b94
join_outer.result, null.result, null.test, item_cmpfunc.h:
...
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects (bug #1990 ).
2003-12-01 13:59:09 -08:00
paul@teton.kitebird.com
e1ae150f96
Fix typos.
2003-12-01 12:56:29 -06:00