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
serg@serg.mylan
16e5b4f0ba
bug #1945 . item(expression)->name=0, crash in find_item_in_list
2003-11-28 12:36:45 +01:00
monty@mysql.com
7f9466a717
Merge
2003-11-28 13:31:38 +02:00
monty@mysql.com
6a3e29c865
Fix wrong last edit for last commit
2003-11-28 13:15:42 +02:00
monty@mysql.com
ede8169d24
Added missing SSL library (Should be in source distribution)
...
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
konstantin@oak.local
3f6ef8d1ae
BK automerge tends to eat break; statements
2003-11-28 13:14:10 +03:00
konstantin@mysql.com
5a4782c360
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
...
into mysql.com:/home/kostja/mysql/mysql-4.1-wl519
2003-11-28 13:12:16 +03:00
konstantin@oak.local
2e8cf31abc
Second part of WL #519 :
...
Client option secure-auth deployed on all possible layers:
- mysql client command-line and config file option
- mysql_options option MYSQL_SECURE_AUTH
- mysql_real_connect will automatically take into account that option if
mysql->options.my_cnf_file/my_cnf_group is set
2003-11-28 13:11:44 +03:00
konstantin@oak.local
38b140fb09
fix:
...
2 forgotten 'break;' statements added
2003-11-28 02:50:58 +03:00
konstantin@mysql.com
faad8c7478
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-11-28 02:03:57 +03:00
konstantin@mysql.com
3b9eb09276
no need to zero-initialize mysql->master->{rpl_pivot, options.rpl_parse,
...
options.rpl_probe} as they are zero-initialized in spawn_init()
2003-11-28 01:57:05 +03:00
konstantin@mysql.com
48ef39ee65
cleanup:
...
no need to set rpl_parse, rpl_probe and rpl_pivot to zero as whole mysql
structure is bzeroed in mysql_init(0) few lines before
2003-11-28 01:54:34 +03:00
bell@sanja.is.com.ua
4014c4eaeb
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-27 19:48:04 +02:00
bell@sanja.is.com.ua
bd0aef2df3
code coverage for UNIONs
2003-11-27 19:45:28 +02:00
konstantin@oak.local
d7b021a308
memory leak (no delete for query= new String) fixed
2003-11-27 19:14:16 +03:00
bell@sanja.is.com.ua
9702a4027d
removed unused variable
2003-11-27 09:34:41 +02:00
bell@sanja.is.com.ua
ef3b51d52b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-26 20:13:00 +02:00
bell@sanja.is.com.ua
908bc22217
avoiding coping tmptable_param
2003-11-26 20:12:26 +02:00
konstantin@oak.local
9be8ea49e1
cleanup
2003-11-26 20:23:28 +03:00
konstantin@oak.local
2556abd912
cleanup
2003-11-26 20:18:55 +03:00
bell@sanja.is.com.ua
5a7514643f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-26 19:13:05 +02:00
bell@sanja.is.com.ua
b633c0ffef
avoiding coping tmp_table_param
2003-11-26 19:10:30 +02:00
guilhem@mysql.com
292b0a1892
Fix for BUG#1960 "date_format() returns spurious '-' for valid dates".
...
It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
I scanned field.cc for other places where we would forget to set neg, found none.
A test for the bug.
2003-11-26 17:06:24 +01:00
lenz@kallisto.local
6549791f21
- fixed compile error in tests/client_test.c
...
(declarations should be on top of a block)
2003-11-26 15:22:30 +01:00
hf@deer.(none)
3e9338f845
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1-w1284
2003-11-26 13:39:18 +04:00
hf@deer.(none)
611096a709
SCRUM
...
WL#1284 (warnings about --skip-name-resolve)
Messages corrected
2003-11-26 13:38:32 +04:00
igor@rurik.mysql.com
b99377f3d2
mi_keycache.c:
...
Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).
my_sys.h:
Removed FLUSH_REMOVE flag.
2003-11-25 22:20:31 -08:00
monty@mysql.com
7733969bf6
Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1
2003-11-26 03:32:39 +02:00
monty@mysql.com
feb7857d1d
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/my/mysql-4.0
2003-11-26 03:30:23 +02:00
monty@mysql.com
ed6e446225
Added compilation comment to 'show variables'
...
This makes it possible to check origin of binary from the output of 'show variables'
2003-11-26 03:30:00 +02:00
igor@rurik.mysql.com
e54f7400ab
mf_keycache.c:
...
Fixed typo that caused blocking key cache usage after resize.
Removed wrong re-initialization of resize queue in init_key_cache.
2003-11-25 17:21:43 -08:00
monty@mysql.com
205c84d3bb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-26 01:49:15 +02:00
monty@mysql.com
f149d8304f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-26 01:00:52 +02:00