bell@laptop.sanja.is.com.ua
dfb7ca08dc
merge
2003-10-07 07:51:14 +03:00
bell@laptop.sanja.is.com.ua
5b13ec47dd
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 02:20:23 +03:00
bell@laptop.sanja.is.com.ua
18bb43671d
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 01:31:16 +03:00
bell@laptop.sanja.is.com.ua
ccaeb61f8b
after merge fix
2003-10-07 01:28:15 +03:00
monty@mishka.mysql.fi
53fa223ed6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-06 22:57:04 +03:00
monty@mishka.mysql.fi
a5c83b05bd
Move init_compiled_charsets to own file
...
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup
2003-10-06 22:56:34 +03:00
bell@laptop.sanja.is.com.ua
0aa70f8115
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
2003-10-06 22:38:51 +03:00
bell@laptop.sanja.is.com.ua
e527f268d5
fixed error names
2003-10-06 22:35:05 +03:00
bell@laptop.sanja.is.com.ua
e1b53fdd42
Merge
2003-10-06 20:55:06 +03:00
hf@deer.(none)
ce6f77a9c5
Fix for #1447
2003-10-06 18:01:11 +05:00
hf@deer.(none)
6b0112549e
Fix for #1488
2003-10-06 17:06:05 +05:00
hf@deer.(none)
8980fe218b
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-06 16:33:07 +05:00
hf@deer.(none)
a5f9c695df
Fix for #1487
2003-10-06 16:32:38 +05:00
bell@laptop.sanja.is.com.ua
ba26a1aa64
fix error messages
...
fix derived inside subqueries
2003-10-06 13:16:56 +03:00
bell@laptop.sanja.is.com.ua
179acaa37e
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-derived-4.1
2003-10-06 12:04:08 +03:00
hf@deer.(none)
4661bd8498
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-06 12:10:18 +05:00
hf@deer.(none)
f576380bc6
Fix for #1470
2003-10-06 12:09:20 +05:00
bell@laptop.sanja.is.com.ua
2103aae552
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
2003-10-05 21:13:54 +03:00
bell@laptop.sanja.is.com.ua
16733e423e
prohibited using derived tables in UPDATE command (BUG#1477)
...
fixed incorrect table name in test
2003-10-05 21:09:50 +03:00
hf@deer.(none)
4ef1e3635d
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-04 19:28:50 +05:00
hf@deer.(none)
8bc13b1874
Fix for bugs #1437 , #1446
2003-10-04 19:28:08 +05:00
bell@laptop.sanja.is.com.ua
a807e6d7d0
fixed error message as suggested by Peter Gulutzan
2003-10-04 13:46:23 +03:00
guilhem@mysql.com
e2ad218dd1
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-03 23:23:59 +02:00
vva@eagle.mysql.r18.ru
a4c0d4dc84
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
2003-10-03 17:23:58 -04:00
vva@eagle.mysql.r18.ru
c56fbbc3b4
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
2003-10-03 17:22:47 -04:00
vva@eagle.mysql.r18.ru
5df8184827
fixed bug with Item_sum_min/Item_sum_max from test func_gconcat.test
2003-10-03 17:22:17 -04:00
guilhem@gbichot2
5e55c4b809
editing comments.
2003-10-03 22:14:23 +02:00
guilhem@gbichot2
6bbf52d2ac
Fix for a rpl_relayrotate failure.
...
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
2003-10-03 20:07:08 +02:00
bar@bar.mysql.r18.ru
67347790de
sql_cache.cc, mysql_priv.h:
...
Query cache now takes in account character_set_results and collation_connection
2003-10-03 17:09:54 +05:00
monty@mishka.mysql.fi
0d21572d01
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-03 02:08:49 +03:00
greg@mysql.com
89fd19f430
Changes in NetWare directory from Novell, pre-4.1.1
2003-10-02 19:08:48 -04: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@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
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
paul@teton.kitebird.com
95dffdb956
Subselect -> subquery
2003-09-30 11:40:15 -05:00
lenz@kallisto.local
58647aa92e
- fixed yet another C++ comment inside a .c file
2003-09-29 22:45:00 +02: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
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