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
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
igor@rurik.mysql.com
413f6b2f83
sql_union.cc:
...
Fixed a bug: missing semicolon.
2003-11-25 15:00:31 -08:00
igor@rurik.mysql.com
66a6f95c47
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2003-11-25 14:33:10 -08:00
igor@rurik.mysql.com
40ff661193
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2003-11-25 14:09:38 -08:00
bell@sanja.is.com.ua
2fb65b4def
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-25 23:56:54 +02:00
bell@sanja.is.com.ua
5474ada47a
added collation processing in UNION merging
...
temporary table BLOB now is longblob
2003-11-25 23:52:10 +02:00
monty@mysql.com
c766c8f4be
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-25 23:15:15 +02:00
monty@mysql.com
b7de8a0bc6
Change to use real_sleep to make test work in build environment
2003-11-25 23:14:49 +02:00
igor@rurik.mysql.com
5eb3763b2f
fork_big2.pl:
...
Added resize key cache test.
2003-11-25 13:06:46 -08:00
igor@rurik.mysql.com
910cd51e59
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-2
2003-11-25 12:00:16 -08:00
heikki@hundin.mysql.fi
dc95a025d6
fil0fil.h, fil0fil.c:
...
ibbackup --apply-log must be able to rename a table based only on the space id
2003-11-25 21:52:22 +02:00
konstantin@mysql.com
42c4e5cad8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-11-25 22:07:11 +03:00