Commit graph

645 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
hf@deer.(none)
e5428b2fe9 Lots of conflicts resolved 2003-05-28 13:54:58 +05:00
vva@mysql.r18.ru
55d4e55f7c fixed small merge bug 2003-05-27 16:58:57 +05:00
jani@ua126d19.elisa.omakaista.fi
3542dad33f Merge jani@192.168.0.2:/my/mysql-4.0
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2003-05-26 15:50:05 +03:00
administrador@light.hegel.local
cded59cbd7 Translation English -> Protuguese 2003-05-23 03:06:00 -03:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
mysqldev@build.mysql2.com
eb3ba82ec6 my_global.h:
- QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX
2003-05-16 13:03:47 +02:00
igor@rurik.mysql.com
a6c634b328 logging_ok:
Logging to logging@openlogging.org accepted
mf_keycache.c:
  Fixed a deadlock when reading from an index file fails.
2003-05-13 12:06:34 -07:00
serg@serg.mylan
0f653b6fed make compilation to work w/o InnoDB as well 2003-04-30 14:15:24 +02:00
serg@serg.mylan
d13e4fc532 CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is) 2003-04-29 00:15:18 +02:00
serg@serg.mylan
30ae0cdcc7 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mylan:/usr/home/serg/Abk/mysql
2003-04-28 20:09:38 +02:00
bell@laptop.sanja.is.com.ua
7f51b1d3e4 Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00: 2003-04-28 20:40:41 +03:00
bell@laptop.sanja.is.com.ua
ed1b48185a fixed incorrect number of affected rows in REPLACE...SELECT... (bug 130) 2003-04-26 15:53:27 +03:00
mmatthew@markslaptop.
44c8a1b012 config-win.h:
Enable 'LOAD LOCAL INFILE', for parity with unix binaries.
2003-04-23 13:43:31 -05:00
peterg@mysql.com
e918ea5488 Modify PeterG's internals documentation per Monty. Added
more detailed explanation of record header and column 
storage.
2003-04-23 11:43:30 -07:00
vva@eagle.mysql.r18.ru
f237ae457a fux bug #183 2003-04-03 20:26:13 -04:00
vva@eagle.mysql.r18.ru
af61a4c7fa Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-03-25 19:58:40 -04:00
vva@eagle.mysql.r18.ru
e1173e70a5 fix bug with parameters of LOAD DATA INFILE in exec_event 2003-03-25 19:57:38 -04:00
guilhem@mysql.com
45e3de8f32 Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;
only do it if the user specifies --delete-master-logs (new option).
Safer + fixes bug #159.
2003-03-19 15:16:51 +01:00
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
bell@sanja.is.com.ua
c6beb583f6 fixed functions to be able work with group function as argument
made bisone 1.75 compatible code
2003-01-29 10:38:56 +02: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