paul@ice.snake.net
93f84357c0
README:
...
minor edits
2003-12-03 21:10:44 -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
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
konstantin@oak.local
f35787b628
cleanup: unused variable removed
...
followup of Bordeaux Optimizer session
2003-12-01 20:53:05 +03:00
konstantin@mysql.com
eb27c16d8b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-01 20:23:46 +03:00
konstantin@oak.local
2d52be9fdf
don't delete select_lex->having and select_lex->where as we delete
...
all items in free_prep_stmt(free_items);
indentation fix
2003-12-01 17:46:07 +03:00
guilhem@mysql.com
b40eb13b79
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-01 15:21:42 +01:00
guilhem@mysql.com
612109ffa0
Removing unneeded code: the Intvar_log_event constructor calls the Log_event constructor
...
which does e.server_id=thd.server_id.
2003-12-01 14:59:35 +01:00
Sinisa@sinisa.nasamreza.org
168e81d6b6
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-01 13:47:05 +02:00
monty@mysql.com
f266cdabab
Portability fixes (for binary build)
...
Added --protocol to mysqlbinlog
2003-12-01 13:13:16 +02:00
monty@mysql.com
3ee758497f
Mark position as # to make test portable
2003-11-28 21:05:53 +02:00
monty@mysql.com
a7610584d6
Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1
2003-11-28 20:44:26 +02:00
monty@mysql.com
cad6b7c8be
rpl_parse and rpl_probe don't have to be reset as they are already 0
2003-11-28 20:41:33 +02:00
monty@mysql.com
2931e100c1
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-28 19:43:30 +02:00
serg@serg.mylan
77d137a24a
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-28 18:18:58 +01:00
serg@serg.mylan
d2e065022f
"optimization cleanup" reverted - problems on rpl_redirect test.
...
It happens that mysql->client_next->client_next=mysql
and mysql_close() goes into infinite loop.
Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
:)
2003-11-28 18:15:58 +01:00
guilhem@mysql.com
398c8de8fa
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-11-28 16:22:45 +01:00
guilhem@mysql.com
c9fd311aac
In the slave I/O thread (in master.info), it seems less worse to flush
...
the relay log before flushing master.info.
Doing 'before' leads to duplicate event, doing after leads to missing event.
Both can be as destructive, but 'duplicate' enables us to later add detection
code to catch it. Whereas 'missing' can't be caught (it can't, because
the I/O thread can produce legal position jumps, for example if it has
ignored an event coming from this slave (rememember that starting from 4.1.1,
the I/O thread filters the server id).
2003-11-28 16:15:21 +01:00
konstantin@mysql.com
4e370c333a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-11-28 17:28:48 +03:00
konstantin@oak.local
e149e63334
cleanup: comment moved to proper place
2003-11-28 17:28:04 +03:00
monty@mysql.com
5914033478
merge with 4.0 to get fix for range bug
2003-11-28 15:55:43 +02:00
monty@mysql.com
1976b25dc6
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/my/mysql-4.0
2003-11-28 15:45:57 +02:00
monty@mysql.com
4f42a47408
Fixed range optimzier bug (Bug #1828 )
2003-11-28 15:45:34 +02:00
monty@mysql.com
8e613176b5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-28 14:47:33 +02:00
monty@mysql.com
320fcb0ef6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-28 14:23:54 +02:00
serg@serg.mylan
ffb499927c
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-28 12:51:15 +01:00
serg@serg.mylan
594f4c35de
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-11-28 12:51:10 +01:00
serg@serg.mylan
3b49d34f97
merged
2003-11-28 12:49:58 +01:00