Commit graph

5190 commits

Author SHA1 Message Date
serg@serg.mylan
b1f5a03685 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-31 14:25:38 +01:00
konstantin@mysql.com
35fe0d898d Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-10-31 15:42:27 +03:00
konstantin@oak.local
d4cc4a3ca1 old_total_warn_count is not used
and was removed from THD
2003-10-31 15:15:13 +03:00
bell@sanja.is.com.ua
5ad2f38f5d amall fix 2003-10-31 11:52:01 +02:00
serg@serg.mylan
74551a72ec Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-31 10:34:34 +01:00
ram@gw.mysql.r18.ru
c5b481d99a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1056
2003-10-31 13:03:12 +04:00
ram@gw.mysql.r18.ru
90ffe1be00 WL #1056: Eliminate NOT operators from where condition 2003-10-31 13:02:16 +04:00
igor@rurik.mysql.com
f29ed57531 Merge 2003-10-30 10:45:28 -08:00
konstantin@mysql.com
2ec94ade8f Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-10-30 21:31:15 +03:00
konstantin@mysql.com
ca34cf30bd comments about designation of thd->where and
thd->proc_info added
2003-10-30 21:30:20 +03:00
serg@serg.mylan
54f9d44b7f merged 2003-10-30 19:26:57 +01:00
serg@serg.mylan
9c4049ad12 Bitmap post-review fixes 2003-10-30 19:17:57 +01:00
guilhem@mysql.com
b99fd4beca Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-30 16:13:38 +01:00
bell@sanja.is.com.ua
807391a031 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1
2003-10-30 15:56:52 +02:00
bell@sanja.is.com.ua
33346e26af added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()
added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274)
2003-10-30 12:57:26 +02:00
konstantin@oak.local
2dadbb3153 small fix in comment 2003-10-30 13:09:38 +03:00
konstantin@oak.local
20ca2dcc09 added fixed= 1 to the end of Item_in_optimizer::fix_fields() 2003-10-30 12:44:25 +03:00
monty@narttu.mysql.fi
a4fff85de5 Safety fix for adding service name to search config groups 2003-10-30 01:20:38 +02:00
monty@narttu.mysql.fi
bc00893d16 Change back service name to MySQL
Don't add service name to read config file segments if it's "MySQL"
Fixed possible memory leak when CHANGE USER failed.
2003-10-30 01:01:53 +02:00
guilhem@mysql.com
59d0872aa0 Fix for BUG#1686
"If 2 master threads with same-name temp table, slave makes bad binlog"
and (two birds with one stone) for
BUG#1240 "slave of slave breaks when STOP SLAVE was issud on parent slave
and temp tables".

Here is the design change:
in a slave running with --log-slave-updates, events are now logged with the
thread id they had on the master. So no more id conflicts between master threads,
but introduces id conflicts between one master thread and one normal 
client thread connected to the slave. This is solved by storing the server id
in the temp table's name.

New test which requires mysql-test-run to be run with --manager,
otherwise it will be skipped.

Undoing a Monty's change (hum, a chill runs down my spine ;) which was
"Cleanup temporary tables when slave ends" in ChangeSet 1.1572.1.1.
2003-10-29 14:23:35 +01:00
serg@serg.mylan
76ff047819 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-29 14:01:14 +01:00
serg@serg.mylan
1d617f1888 followup to max_user_connections fix, keep the count more accurate 2003-10-29 08:33:31 +01:00
monty@narttu.mysql.fi
d1572484bb Fix for problem of installing MySQL as a service with
mysql --install mysql --defualts-file=path-to-file
(Bug #1643)
2003-10-28 18:36:41 +02:00
bell@sanja.is.com.ua
ae380c5855 merge 2003-10-28 12:45:37 +02:00
serg@serg.mylan
75454930dc fixes for max_user_connections (connections are now counted even if
max_user_connections is not set - that is no limit - so that when
max_user_connections is set (with SET) old connections are also
taken into account
mutexes are added where appropriate
2003-10-27 15:14:03 +01:00
pem@mysql.comhem.se
ea075fbb65 BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
Fixed. Enabled test case in client_test.c.
2003-10-27 10:50:18 +01:00
bell@sanja.is.com.ua
2efab5b67d fixed ALL/ANY optimisation with union (BUG#1668)
code cleanup
2003-10-27 01:01:27 +02:00
bell@sanja.is.com.ua
b9156c1871 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_warn-4.1
2003-10-26 22:04:25 +02:00
heikki@hundin.mysql.fi
24db4ecf97 sql_parse.cc:
Fix yet another race condition in sql_parse.cc: thd->user_connect object could get deleted too soon, before the call of check_for_max_user_connections
2003-10-26 20:56:52 +02:00
bell@sanja.is.com.ua
393838ad61 merge 2003-10-26 19:38:41 +02:00
serg@serg.mylan
eb93b6b81a return proper value (otherwise mysld crashes here) 2003-10-25 21:12:38 +02:00
heikki@hundin.mysql.fi
5584d422ee sql_parse.cc:
Add diagnostic printf to chack that number of connections for a user never drops below zero
2003-10-25 19:12:29 +03:00
bell@sanja.is.com.ua
f293edd19b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-10-25 16:35:14 +03:00
bell@sanja.is.com.ua
defa3d4869 fixed unlinking SELECT methods 2003-10-25 16:29:35 +03:00
serg@serg.mylan
9fa202de5f and -> && 2003-10-25 12:00:53 +02:00
bell@sanja.is.com.ua
4da4fdbf7c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-10-25 10:18:37 +03:00
heikki@hundin.mysql.fi
7891550ebe sql_parse.cc:
URGENT: MONTY AND SERGEI should check this patch! The patch fixes the memory corruption reported by a user. It happened because the code did not keep correct a count of how many connections a user has, and the user object got freed too soon if the same user had more than 1 connection. Also fix a typo by Sanja: 'and' is not a C operator, I think it should be &&
2003-10-25 01:38:42 +03:00
serg@serg.mylan
8cdc27da15 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-25 00:03:44 +02:00
serg@serg.mylan
dd860ba354 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
2003-10-24 23:53:53 +02:00
serg@serg.mylan
c752d2cad0 removed one more hack that - as usual - almost always worked
(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636
2003-10-24 23:27:21 +02:00
serg@serg.mylan
6e17f4f20d fixes to Bitmap class 2003-10-24 22:44:48 +02:00
bell@sanja.is.com.ua
0ad0c8ff3d after merge fix 2003-10-24 21:14:26 +03:00
bell@sanja.is.com.ua
85bdf7b925 made 'TODO' 2003-10-24 20:09:57 +03:00
bell@sanja.is.com.ua
caa9645c24 Merge 2003-10-24 19:42:39 +03:00
bell@sanja.is.com.ua
6300a01909 added comment 2003-10-24 19:30:47 +03:00
bell@sanja.is.com.ua
f349adf8de support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned
(BUG#1484)
2003-10-24 17:28:32 +03:00
serg@serg.mylan
944570970d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-23 23:11:33 +02:00
bell@sanja.is.com.ua
6457b89948 added check of cardinality to IN/ALL/ANY subquery transformer
(BUG#1638)
2003-10-23 23:54:21 +03:00
bell@sanja.is.com.ua
4e1920762a Merge 2003-10-23 23:06:43 +03:00
bell@sanja.is.com.ua
faea7e0144 Merge 2003-10-23 21:26:06 +03:00