mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19767 commits 2784 branches 343 tags 1.6 GiB
Commit graph

19767 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com
3369f5bd89 Merge mysql.com:/usr/home/bar/mysql-4.1.b13145 
into  mysql.com:/usr/home/bar/mysql-4.1
 2005-10-14 13:57:38 +05:00
bar@mysql.com
5df9c6c2a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 11:54:10 +05:00
bar@mysql.com
58343bede3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 09:09:25 +05:00
bell@sanja.is.com.ua
f89b2ab09b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
 2005-10-14 00:04:40 +03:00
bell@sanja.is.com.ua
6d6e107f12 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236) 
- fixed test
 2005-10-14 00:02:38 +03:00
lenz@mysql.com
2115b397ca Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-10-13 22:29:50 +02:00
lenz@mysql.com
b72e1afbcc Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-10-13 22:11:49 +02:00
lenz@mysql.com
c93927eef0 - added a usermod call in the postinstall section of the RPM spec file 
to assign a potential existing mysql user to the correct user group (BUG#12823)
 2005-10-13 22:10:54 +02:00
lenz@mysql.com
a315d1be76 RPM spec file fixes: 
- added a usermod call to assign a potential existing mysql user to the
   correct user group (BUG#12823)
 - Save the perror binary built during Max build so it supports the NDB
   error codes (BUG#13740)
 - added a separate macro "mysqld_group" to be able to define the
   user group of the mysql user seperately, if desired.
 2005-10-13 22:01:02 +02:00
monty@mysql.com
829a4831b1 Fixes during review of new code 2005-10-13 19:24:01 +03:00
monty@mysql.com
852a745966 Use 4.1 code 2005-10-13 18:48:58 +03:00
hf@deer.(none)
19869bd19f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-10-13 19:53:45 +05:00
hf@deer.(none)
27d8bc5b1f merging 2005-10-13 19:51:07 +05:00
monty@mysql.com
0f9a3c1cf9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/my/mysql-4.0
 2005-10-13 17:42:15 +03:00
monty@mysql.com
144c873e39 Review of new pushed code 
- No need to check *ref when ref is checked (Simple optimization fix)
 2005-10-13 17:41:55 +03:00
hf@deer.(none)
62ffbea5e4 merging 2005-10-13 19:31:09 +05:00
hf@deer.(none)
c933505d2d Fix for bug #3874 (Group by field is not considered) 2005-10-13 19:23:52 +05:00
jani@ua141d10.elisa.omakaista.fi
cf173e553d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
 2005-10-13 17:21:54 +03:00
jani@ua141d10.elisa.omakaista.fi
5dad171618 Some Netware related fixes and fixes for Metrowerks compiler. 2005-10-13 17:21:14 +03:00
evgen@moonbone.local
818c37ac68 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13535-bug-4.1-mysql
 2005-10-13 17:17:32 +04:00
kent@mysql.com
ab22636120 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-10-13 14:23:37 +02:00
bar@mysql.com
4e0b80d9af Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
 2005-10-13 13:38:15 +05:00
ramil@mysql.com
8682dffc68 memcpy_overlap() replaced with memmove() during the merging. 2005-10-13 13:25:07 +05:00
ramil@mysql.com
2ffbe01127 Merge mysql.com:/usr/home/ram/work/mysql-4.0 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2005-10-13 12:48:30 +05:00
bar@mysql.com
85243ffd70 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
 2005-10-13 11:25:08 +05:00
jimw@mysql.com
701a137844 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 16:07:16 -07:00
jimw@mysql.com
f50e7466e3 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 14:38:32 -07:00
evgen@moonbone.local
fb0074a6ad Manual merged 2005-10-13 01:14:58 +04:00
evgen@moonbone.local
551961b207 select.test, sql_select.cc, sql_lex.cc, item.cc: 
Bug #7672 after merge fix
 2005-10-13 00:58:59 +04:00
jimw@mysql.com
aeb6611b07 Merge mysql.com:/home/jimw/my/mysql-4.1-6413 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:31:01 -07:00
jimw@mysql.com
041ae69093 Merge mysql.com:/home/jimw/my/mysql-4.1-12136 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:29:49 -07:00
guilhem@mysql.com
11848b53d3 To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty. 2005-10-12 22:29:36 +02:00
jimw@mysql.com
cb0d8aba46 Merge mysql.com:/home/jimw/my/mysql-4.1-8731b 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:28:46 -07:00
jimw@mysql.com
626c8a1c8c Merge mysql.com:/home/jimw/my/mysql-4.1-13344 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:27:49 -07:00
jimw@mysql.com
6a19058c55 Merge mysql.com:/home/jimw/my/mysql-4.1-13619 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:26:49 -07:00
evgen@moonbone.local
902b06ecb1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13535-bug-4.1-mysql
 2005-10-13 00:16:33 +04:00
ramil@mysql.com
58c64aea92 memcpy_overlap() removed, as 
1. it's wrong to use memcpy() for overlapped areas;
  2. we use it only once.
During merge to 4.1 will remove a memcpy_overlap() call 
from strings/ctype-tis620.c as well in order to fix 
bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.
 2005-10-12 18:50:25 +05:00
guilhem@mysql.com
ab05c75ea7 merge 2005-10-12 13:31:48 +02:00
guilhem@mysql.com
4c1c9db823 Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc; 
in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
the master though it's data-wise it's not).
 2005-10-12 13:29:55 +02:00
grog@mysql.com
d1132f0ef1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/users/grog/4.1
 2005-10-12 09:54:20 +02:00
grog@mysql.com
c248a36e30 sql_yacc.yy: 
Bug #10308: Parse 'purge master logs' with subselect correctly.
subselect.test:
  Bug #10308: Test for 'purge master logs' with subselect.
subselect.result:
  Bug #10308: Test result for 'purge master logs' with subselect.
 2005-10-12 09:47:59 +02:00
evgen@moonbone.local
c16410d3a1 Manual merge, fix for bug #7672 2005-10-12 03:32:14 +04:00
jimw@mysql.com
281b8e26d8 Fix read past allocated buffer when parsing charsets file. (Bug #6413) 2005-10-11 15:23:34 -07:00
kent@mysql.com
c1de265163 mysqlwatch.vcproj: 
Removed Debug target not used
mysql.sln:
  Added pro-gpl target
  Build mysqlwatch and mysqlshutdown for classic as well
 2005-10-11 22:34:40 +02:00
lenz@mysql.com
c36cf6dbd9 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-10-11 22:31:08 +02:00
lenz@mysql.com
16b0bc39aa Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.0-build
 2005-10-11 22:30:37 +02:00
lenz@mysql.com
9b4ab5931a Merge mysql.com:/space/my/mysql-4.0-build 
into mysql.com:/space/my/mysql-4.1-build
 2005-10-11 21:24:01 +02:00
lenz@mysql.com
8782f5a0e3 - added Docs/manual.chm to the windows source distribution (BUG#13899) 2005-10-11 21:16:08 +02:00
jimw@mysql.com
c8a6c2c614 Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how 
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731)
 2005-10-11 09:12:12 -07:00
gluh@eagle.intranet.mysql.r18.ru
8d01ea1be7 Fix for bug#9270 multiple SSL race conditions (for 5.0 tree) 
The fix is needed to perform locking on shared data structures
  This is modification of patch proposed by Leandro Santi
  (see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch)
 2005-10-11 16:26:00 +05:00