bell@laptop.sanja.is.com.ua
9db4024b8d
thd pointer storing moved to fix_fields() (WL#1254) (SCRUM)
2003-10-02 22:19:41 +03:00
guilhem@gbichot2
8f54a88fb7
minor edit (changed tense) as suggested by our docs team.
...
Portuguese and Swedish are not affected (they were already translated).
2003-10-02 16:39:48 +02:00
guilhem@mysql.com
b95e3911a2
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-02 16:26:39 +02:00
guilhem@mysql.com
9f4d29c3f3
Reverting changeset 1.1590
2003-10-02 16:25:47 +02:00
guilhem@gbichot2
d099c0ed40
Had mangled the order of if()s in a previous changeset (1.1596) (not pushed),
...
correcting it now. Thanks Dmitri for spotting this.
2003-10-02 16:19:33 +02:00
bell@laptop.sanja.is.com.ua
d360ddc0b2
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_struct-4.1
2003-10-02 12:18:34 +03:00
bell@laptop.sanja.is.com.ua
c3ab43b3f0
Structure for storing parameters of query in query cache (asked by Bar)
2003-10-02 12:02:05 +03:00
guilhem@gbichot2
2f11e5d1d3
fix for BUG#1331: "Unexistent user variable is not replicated".
...
When an update query is to be written to the binlog, and it reads unset
user variables (example: INSERT INTO t VALUEs(@a) where @a does not exist),
we create the variable like if it had been set with SET before, and we loop
(i.e. we redo the steps of logging, now that the variable exists).
2003-10-02 10:31:37 +02:00
paul@teton.kitebird.com
3bee8b429d
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-10-01 12:24:40 -05:00
guilhem@mysql.com
8c13c30142
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-01 18:46:24 +02:00
guilhem@mysql.com
301a30cbdd
Follow-up of an IRC discussion today. Declaring ignore_log_space_limit volatile,
...
and a comment to explain why.
2003-10-01 18:40:27 +02:00
vva@eagle.mysql.r18.ru
14a2466532
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_1194/mysql-4.0
2003-10-01 12:22:30 -04:00
vva@eagle.mysql.r18.ru
761c790636
turn Item_func_set_user_var
...
::native_val, ::native_val_int and native_val_str into inline
2003-10-01 12:00:08 -04:00
hf@deer.(none)
0c1d64959d
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-01 16:45:37 +05:00
hf@deer.(none)
73f2e739b2
Fix for #1430
...
there was an error about sendind prepared parameters to the server
2003-10-01 16:44:57 +05:00
bar@bar.mysql.r18.ru
d1ae1a1f88
ctype-mb.c:
...
Stupid typo. Led to compilation failure with non-gcc compilers.
2003-10-01 11:04:19 +05:00
greg@mysql.com
7aae6ba45d
New build directory files - NetWare only, as used in 4.0.15
2003-09-30 23:14:07 -04:00
paul@teton.kitebird.com
95dffdb956
Subselect -> subquery
2003-09-30 11:40:15 -05:00
vva@eagle.mysql.r18.ru
fd835da6ec
rewrite Item_func_set_user_var ::val, ::val_str, ::val_int, ::update
...
with less code duplication
2003-09-30 12:32:48 -04:00
guilhem@mysql.com
8d083df3a8
A note that Valgrind does not give a good stacktrace when the problem
...
is involving an assembly function.
Testcase was BUG#1194
SELECT @a:=1; SELECT @a, @a:=1;
2003-09-30 00:08:12 +02:00
guilhem@mysql.com
7234ed2681
fix for a random test failure on hpux/ia64
...
(a missing synchronization in the test)
2003-09-29 22:56:31 +02:00
lenz@kallisto.local
58647aa92e
- fixed yet another C++ comment inside a .c file
2003-09-29 22:45:00 +02:00
dlenev@mysql.com
573e5bffbf
Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution).
2003-09-29 23:10:30 +04:00
monty@mishka.mysql.fi
a5d9c195d3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.fi:/home/my/mysql-4.1
2003-09-29 22:06:49 +03:00
monty@mishka.mysql.fi
9210e8729a
Add missing define (after merge)
2003-09-29 22:06:31 +03:00
hf@deer.(none)
9dcce9b0f3
fix for #1344
...
handling of init-file option added to embedded library
main problem was killing of output (resulting recordsets etc)
i added checks for empty output in Protocol:: methods
better solution could be special Protocol_nul class to redirect
results to nowhere
2003-09-29 21:07:53 +05:00
hf@deer.(none)
44e018315f
Bugfix for #1342
...
I made libmysqld not to do freopen(stdout...)
I think we need better solution here so i added it as a worklog entry #1247
2003-09-29 21:07:52 +05:00
monty@narttu.mysql.fi
7a405a2d54
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-09-29 19:07:51 +03:00
hf@deer.(none)
6d3d37c6f8
bugfix for #1375
2003-09-29 21:07:51 +05:00
hf@deer.(none)
e9d7b859e4
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-29 21:07:50 +05:00
vva@eagle.mysql.r18.ru
b099d43123
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1
2003-09-29 12:07:49 -04:00
vva@eagle.mysql.r18.ru
d1cf77f4bf
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1
2003-09-29 12:06:23 -04:00
vva@eagle.mysql.r18.ru
e2fe872181
added fine error messages in scripts/fill_help_tables.sh
2003-09-29 11:39:00 -04:00
lenz@mysql.com
9b8b92faff
- enable changing the number of table bits for JOINs to be increased
...
from ulong to ulonglong by defining -DBIG_JOINS
2003-09-29 12:01:10 +02:00
monty@narttu.mysql.fi
6905d7963e
Don't print warnings about 'setrlimit' if --warnings is not given
...
Code review/cleanup of sub subselect_uniquesubquery_engine
2003-09-29 12:39:38 +03:00
monty@narttu.mysql.fi
89f30200bc
Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)
...
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result
2003-09-29 12:31:35 +03:00
hf@deer.(none)
cca80f8b58
SCRUM
...
embedded library
some fixes - cleanup procedure changed for embedded library - deletion of
embedded mysql->thd
2003-09-29 14:09:51 +05:00
hf@deer.(none)
3f0096f9bb
SCRUM
...
WL604 Privilegies in embedded library
another bug fixed
2003-09-29 12:50:28 +05:00
hf@deer.(none)
9612ca5f58
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-29 12:27:39 +05:00
hf@deer.(none)
7f542f3e33
SCRUM
...
WL#604 Privileges in embedded library
bugs fixed
2003-09-29 11:47:37 +05:00
guilhem@mysql.com
9d7014c07b
Fix for BUG#1345 "SQL Syntax Error in binarylog with DROP TABLES":
...
it's just backquoting the db's and table's names
when writing DROP TEMPORARY TABLE to the binlog when a connection ends.
A testcase for this.
2003-09-28 18:31:49 +02:00
lenz@mysql.com
d62eaa7815
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2003-09-27 00:43:12 +02:00
lenz@kallisto.local
f950139321
- better test for a string to avoid "test: integer expression expected"
...
if a variable is not defined (empty).
2003-09-27 00:25:57 +02:00
lenz@kallisto.local
492ecc54f0
- added missing zlib subdirectory to the source distribution
...
(crc32.c is included by mysys/my_crc32.c)
2003-09-26 23:57:06 +02:00
guilhem@mysql.com
4a7b5b26e2
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-26 23:44:27 +02:00
guilhem@mysql.com
7dbbd82f13
Fix for 64-bit machines.
...
I am almost sure this is the cause for
BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries?
BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris)
The reason why I think it's wrong is that the normal client code has
uint32 ip_addr.
(of course on 32-bit machines it does not matter, but on 64-bit it does).
2003-09-26 23:43:22 +02:00
guilhem@mysql.com
e274bfb148
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-26 22:57:34 +02:00
guilhem@gbichot2
30c55ea464
A fix of the fix for BUG#1209 (was: SELECT DATABASE() still shows dropped database).
...
Don't free the client's selected db (thd->db) when it has been DROPped,
if this is a slave thread; the x_free() was causing a lot
of various bugs in rpl_loaddata_rule_m (garbage characters, segfault, hangs in
other threads).
A small post-merge fix (rli->inside_transaction exists in 4.0 only).
2003-09-26 22:56:13 +02:00
dlenev@mysql.com
4fedb81eda
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-rplunt
2003-09-26 17:55:10 +04:00
dlenev@dlenev.mshome
3f586da948
Fixed spurios failures of rpl_until test.
2003-09-26 17:42:05 +04:00