Commit graph

9610 commits

Author SHA1 Message Date
hf@deer.(none)
f576380bc6 Fix for #1470 2003-10-06 12:09:20 +05: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
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
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
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
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
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
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
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
hf@deer.(none)
5f8e7fef27 Merge 2003-09-26 15:40:26 +05:00
hf@deer.(none)
ba8fa76fa2 SCRUM:
WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server
2003-09-26 15:33:13 +05:00
bar@bar.mysql.r18.ru
d5d4923107 LPAD and RPAD test with UCS2 was added. 2003-09-25 18:06:39 +05:00
bar@bar.mysql.r18.ru
ebbc1dc13e LPAD() and RPAD() are now multibyte-compatible 2003-09-25 17:31:20 +05:00
bar@bar.mysql.r18.ru
9b4b9f91de CHARSET_INFO::instr was extended to return more substring match results:
- offset of substr begining
- offset of substr end
- number of characters (MB compatible)
2003-09-25 13:35:21 +05:00
hf@deer.(none)
192fcb9cc6 Bug fixed
null_string wasn't known in libmysqld/lib_sql.cc, that caused compiler's error
i put the declaration of the null_string in mysql_priv.h and renamed it
to my_null_string to reduce the probability of name's intersections
2003-09-25 13:02:45 +05:00
monty@mishka.mysql.fi
5077ea0e2d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1
2003-09-24 11:57:27 +03:00
bar@bar.mysql.r18.ru
52bb4efcdd regexp worked only with the default character set.
Now it can work with any character set.
2003-09-24 13:57:26 +05:00
monty@mishka.mysql.fi
c22c1d8a4d merge 2003-09-24 10:24:56 +03:00