Commit graph

605 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
mysql@home.(none)
c6efa7a8b7 New function my_charset_same() 2003-03-16 17:19:24 +04:00
root@home.(none)
f71a7e4b05 set_default_charset() is not used anymore
Some system_charset_info were removed
2003-03-16 10:56:14 +04:00
pgulutzan@linux.local
eda388ed3b Added PeterG's new internals documenation. 2003-03-12 21:35:57 -08:00
gluh@gluh.mysql.r18.ru
6253889109 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last
2003-03-11 13:52:19 +04:00
gluh@gluh.mysql.r18.ru
00314bfd88 Openssl test 2003-03-11 13:41:53 +04:00
hf@deer.mysql.r18.ru
2be2914a82 Handling of log-error added in embedded server 2003-03-10 14:06:21 +04:00
wax@kishkin.ru
15e69055a1 URGENT fixed bug in shared memory (handler_count) 2003-03-02 19:35:37 +05:00
guilhem@mysql.com
10735252ee When the SQL thread cannot read an event from the relay log
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.
2003-03-02 00:34:44 +01:00
papa@gbichot.local
b9d94d2b6f Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
Disabling can be safer when the server silently dies & restarts.
This is for SCRUM task #727.
2003-03-01 23:34:34 +01:00
monty@narttu.mysql.fi
9a46698e1e Merge with 4.0.11 2003-02-26 01:03:47 +02:00
igor@hundin.mysql.fi
726e59827a opt_sum.cc:
Correction for min/max optimization of queries with outer joins
2003-02-23 04:27:03 +02:00
guilhem@mysql.com
e91a9c79ba Test's result update because std_data/words.dat has been lengthened by 500 bytes.
Increased some tests' robustness a bit :
- Added RESET MASTER to all tests who do SHOW BINLOG EVENTS, to make them independent from previous tests.
- Added save_master_pos to these tests to wait for the slave to start before purging its binary logs.
2003-02-21 23:38:56 +01:00
greg@mysql.com
b080118808 mwldnlm, mwenv, mwccnlm, mwasmnlm, nwconfigure, nwbootstrap:
new file
2003-02-18 17:48:04 -05:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
lenz@mysql.com
2f8ed79215 - really deleted makefile.w32 to resolve a namespace conflict on
case-insensitive File Systems (e.g. Mac OS X)
2003-02-03 14:39:15 +01:00
gweir@work.mysql.com
46e3b6157b Many files:
new file
Makefile.am:
  Changes from Novell diff
2003-02-01 00:42:26 +01:00
igor@hundin.mysql.fi
6fea54dd8d my_pthread.h:
Missing merge in changeset 1.1435
2003-01-28 05:34:32 +02:00
venu@hundin.mysql.fi
961d2c3e89 Introduced a scalable key cache management.
Added some fields to the st_my_thread_var structure to be
  able to link such structures into a list.
2003-01-28 03:37:57 +02:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
gluh@gluh.mysql.r18.ru
6ac602142a Replication: Optimize away string.append
Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
Fixed rpl_temporary test
2003-01-17 16:39:29 +04:00
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
monty@mashka.mysql.fi
f9772317ee merge 2003-01-04 15:40:55 +02:00
ram@mysql.r18.ru
8009c16a34 Fix for the QUOTE() function. 2003-01-03 19:46:15 +04:00
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00
salle@banica.(none)
a2e82f5ff7 Removed ^M
Reported by Georg Richter as it brokes his build with mipspro
2002-12-27 18:13:32 +02:00
jani@dsl-kpogw4gb5.dial.inet.fi
a684fa70ed mysql multiline comment, by Sergey Gluhov. 2002-12-24 00:53:07 +02:00
hf@deer.mysql.r18.ru
05de9d5fa9 Spatial-related fixes 2002-12-18 17:17:35 +04:00
hf@deer.mysql.r18.ru
c1e69d2cca Merging 2002-12-16 18:58:55 +04:00
vva@eagle.mysql.r18.ru
4963f1c6c9 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/SOUNDS_LIKE/4.1
2002-12-14 02:18:58 +04:00
vva@eagle.mysql.r18.ru
7050b5eb4d add 'SOUNDS LIKE' syntax 2002-12-14 02:18:14 +04:00
ranger@regul.home.lan
8a46cc3868 - Fix handling of suffix option
- Replace function 'check_reserved_words' with correct one
2002-12-12 11:06:55 +02:00
hf@deer.mysql.r18.ru
3517febe97 Resolving merge conflicts 2002-12-12 12:49:56 +04:00
hf@deer.mysql.r18.ru
dcb5293576 Some fixes 2002-12-12 12:16:34 +04:00
zak@mysql.com
f666bfcc85 A set of improvements to the German localized error messages 2002-12-11 20:17:15 -07:00
walrus@kishkin.ru
24bbcd92bc merge Ranger's patches to crash-me, add new tests ( DEFAULT VALUES )
to crash-me
2002-12-10 18:40:38 +05:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04:00
pem@mysql.com
130e00ef5e A better way to get the ChangeSet revision for the Subject: line. 2002-11-28 12:45:01 +01:00
pem@mysql.com
608ab49eff Add the ChangeSet id to Subject: in all emails. 2002-11-27 13:01:50 +01:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
wax@mysql.com
e91d1b2cbe Add shared memory protocol and option --protocol 2002-11-15 00:16:30 +05:00
monty@mashka.mysql.fi
aa67a79632 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-14 12:35:33 +02:00
monty@mashka.mysql.fi
7a70332836 Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
serg@serg.mysql.com
31fa2c5084 merged 2002-11-13 23:38:19 +01:00
salle@geopard.(none)
abac2ef1e5 Merge akeremidarski@work.mysql.com:/home/bk/mysql
into geopard.(none):/storage/bk/mysql-3.23
2002-11-11 10:52:39 +02:00
serg@serg.mysql.com
14f819fe96 fixing gone file ONCE AGAIN 2002-11-09 13:54:27 +01:00
serg@serg.mysql.com
2dd302de62 fixed gone file ONCE AGAIN 2002-11-08 23:34:17 +01:00
serg@serg.mysql.com
4802cda2e9 fixing gone file ONCE AGAIN 2002-11-08 23:24:38 +01:00
walrus@mysql.com
b841b4e8cd Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2002-11-09 01:16:40 +05:00