aivanov@mysql.com
e203a42dfc
Fix for BUG#4375: Windows specific directories are copied
...
during replication.
Modified my_dir(). Now this function skips hidden and system
files which sometimes are created by Windows.
NOTE. The fix is similar to the previuos one (05 July 2004)
except for correct setting of the 'attrib' variable value
(within the previous fix this variable was left uninitialized
when my_dir() was called with My_flags & MY_WANT_STAT == 0).
2005-10-19 18:01:23 +04:00
jimw@mysql.com
746251a47c
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 10:49:28 -07:00
jimw@mysql.com
e284a57c88
Merge mysql.com:/home/jimw/my/mysql-4.1-13334
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:45:12 -07:00
jimw@mysql.com
162b3de29a
Merge mysql.com:/home/jimw/my/mysql-4.1-13064
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:44:29 -07:00
jani@ua141d10.elisa.omakaista.fi
1b7a4abf59
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-18 18:04:00 +03:00
jani@ua141d10.elisa.omakaista.fi
8e1dac44b4
Some fixes to avoid compiler warnings.
2005-10-18 18:03:26 +03:00
sergefp@mysql.com
d6903c4566
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2
2005-10-18 14:08:50 +04:00
sergefp@mysql.com
b91173af11
BUG#12915: post-review fixes
2005-10-18 14:04:14 +04:00
jimw@mysql.com
31a79ee3d0
Fix Item_func_abs::fix_length_and_dec() to set maybe_null properly. (Bug #14009 )
2005-10-17 17:00:42 -07:00
jonas@perch.ndb.mysql.com
d10326a3dc
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-17 09:56:56 +02:00
jonas@perch.ndb.mysql.com
a36faf33d3
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-17 09:55:30 +02:00
jonas@perch.ndb.mysql.com
f3f7f07131
ndb - hugo
...
Disable tests of lock upgrade paths that are currently unsupported
2005-10-17 09:51:16 +02:00
guilhem@mysql.com
b709578f1f
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2005-10-14 15:35:57 +02:00
guilhem@mysql.com
845b9fbf58
fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
...
because they are used by net_printf() and push_warning(), which can be called if check_connection() fails.
2005-10-14 15:34:52 +02:00
mskold@mysql.com
997e78c7f4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-10-14 11:52:52 +02:00
mskold@mysql.com
f9b58b0805
Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values into table (clean version)
2005-10-14 11:23:02 +02:00
bar@mysql.com
48238e1b90
Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-10-14 14:07:22 +05:00
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
evgen@moonbone.local
40f8a8ff3e
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into moonbone.local:/work/13855-bug-4.0-mysql
2005-10-14 03:12:32 +04:00
evgen@moonbone.local
aff8dbe130
Fix bug #13855 select distinct with group by caused server crash
...
DISTINCT wasn't optimized away and caused creation of tmp table in wrong
case. This result in integer overrun and running out of memory.
Fix backported from 4.1. Now if optimizer founds that in result be only 1
row it removes distinct.
2005-10-14 01:22:24 +04: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
07a910e9fe
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0
2005-10-13 22:29:29 +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
jimw@mysql.com
8ae2cfb0f7
Force a server restart for the not_embedded_server test to satisfy
...
conditions of its first test. (Bug #13796 )
2005-10-13 11:10:45 -07:00
jimw@mysql.com
8f659d05a2
Fix typo (thread_cache should be thread_cache_size) in example
...
configuration files. (Bug #13811 )
2005-10-13 11:05:59 -07: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
joerg@mysql.com
952f0c461c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-10-13 16:53:46 +02: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
msvensson@neptunus.(none)
1fc54b1045
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12698/my41-bug12698
2005-10-13 15:53:02 +02:00
msvensson@neptunus.(none)
b81f3ef1ef
Bug #12698 abnormal program termination running mysql_client_test
...
- Move test for bug#93 from mysql_client_test.c to show_check.test
- No need for test written in c
2005-10-13 15:52:22 +02: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
joerg@mysql.com
233ff1c49d
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-10-13 14:32:10 +02: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
msvensson@neptunus.(none)
0ac493d16c
Bug #12698 abnormal program termination running mysql_client_test
...
- The testcase create a .frm file consisting of "junk". Unfortunately the "junk" wasn't
written to the .frm file if mysql_client_test was run with -s option to make it run silent.
This most likely caused the file never to be created on windows, and thus the
test case failed.
2005-10-13 13:37:10 +02:00
joerg@mysql.com
63e236426c
Merge mysql.com:/M41/clone-4.1-current into mysql.com:/M41/mysql-4.1
2005-10-13 12:36:41 +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