tomas@poseidon.ndb.mysql.com
911d878ca9
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
konstantin@mysql.com
9c6f14aa3d
Get rid of checking for ETIME return value of pthread_cond_timedwait.
...
ETIME was returned by cond_timedwait (sic, the pre-POSIX1001b function) on
Solaris 2.6 and 2.7. pthread_cond_timedwait on Solaris returns ETIMEDOUT.
The standard requirement is that the only additional return value
of pthred_cond_timedwait compared to pthread_cond_wait is ETIMEDOUT.
Let us not bloat the application code with redundant checks,
and if we're ever to work on a platform that returns a non-standard
value, we should write a wrapper for that platform (like we do, e.g., for
Windows).
2005-07-14 19:42:56 +04:00
tomas@poseidon.ndb.mysql.com
1104d4c562
post merge fixes
2005-07-13 01:25:36 +02:00
tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
jimw@mysql.com
7d7a59e46f
Look in the directory above the executable for the my.cnf/ini, on Windows, as
...
the new installer and GUI tools expect. (Bug #10419 ) Also, dynamically bind to
GetSystemWindowsDirectory() so that it works on all platforms. (Bug #5354 )
2005-07-06 19:49:43 +02:00
kent@mysql.com
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
jimw@mysql.com
485f2c93c2
Merge mysql.com:/home/jimw/my/mysql-5.0-10214
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 09:47:20 -07:00
jimw@mysql.com
de55960430
Add documentation to the escape_*() functions in mysys.
2005-07-05 09:45:32 -07:00
gbichot@production.mysql.com
9cfdf2861a
Making rpl_until more robust if machine is slow. Removing rpl_trunc_binlog
...
which is wrong now that slave recovers gracefully from a crashed binlog (thx Serg).
stat -> my_stat in my_copy.c so that failing stat() does not hang client connection.
2005-07-04 22:27:16 +02:00
monty@mysql.com
fe30ec9032
manual merge
2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43
Fixes during review of new code
...
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
2005-07-04 03:42:33 +03:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
bell@sanja.is.com.ua
d3905f3d0e
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
marty@linux.site
e4aedcc2c1
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into linux.site:/home/marty/MySQL/mysql-5.0
2005-06-30 12:20:52 +02:00
petr@mysql.com
1ac5889329
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-06-29 13:46:52 +04:00
petr@mysql.com
5e72092eb7
post review fixes (second review)
2005-06-29 13:27:27 +04:00
petr@mysql.com
8a05713517
post review fixes to a patch
2005-06-29 02:24:31 +04:00
monty@mysql.com
10c4678def
Move reset of insert_values to ensure it's done also during error conditions
...
This fixed a failure of insert_update.test on some platforms
2005-06-28 15:06:16 +03:00
monty@mishka.local
83f90e060e
Better bug fix for:
...
#9728 'Decreased functionality in "on duplicate key update
#8147 'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'
This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
2005-06-27 16:46:41 +03:00
ingo@mysql.com
e81358565b
Bug#8321 - myisampack bug in compression algorithm
...
Added 64-bit extensions, comments, extended statistics
and trace prints.
2005-06-24 19:34:55 +02:00
jimw@mysql.com
3ccb90c085
Make status of NO_BACKSLASH_ESCAPES mode known to the client so
...
it can use it to switch to only quoting apostrophes by doubling
them when it is in effect. (Bug #10214 )
2005-06-23 18:29:56 -07:00
petr@mysql.com
c19fd75e6b
Fix modify_defaults_file as agreed with monty (correct all occurences of an option in the section)
2005-06-23 18:13:58 +04:00
monty@mishka.local
d0700b819e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-06-23 14:04:11 +03:00
ndbdev@dl145b.mysql.com
053dd260ee
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-23 01:51:49 +02:00
reggie@mdk10.(none)
98ddf74dd3
Merge mdk10.(none):/home/reggie/bk/bug9148
...
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
2005-06-22 18:51:48 -05:00
tulin@dl145b.mysql.com
4b41a1872e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-22 11:50:12 +02:00
petr@mysql.com
cb44682a35
Add a missing statement, add licensing info and correct coding style
2005-06-22 05:40:06 +04:00
reggie@mdk10.(none)
93b38c5f67
Bug #9148 Denial of Service
...
my_access.c:
Fixed problem where in some cases check_if_legal_filename was returning 0 for illegal names
2005-06-21 13:35:12 -05:00
monty@mishka.local
1524cd001d
Cleanup during review of new code
...
Fixed wrong allocation that could cause buffer overrun when using join cache
2005-06-21 18:18:58 +03:00
ndbdev@dl145b.mysql.com
a398734315
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-16 12:02:17 +02:00
ramil@mysql.com
22646589b6
a fix (bug #10650 : Bit literal case sensitivity).
2005-06-16 12:17:15 +05:00
ndbdev@dl145b.mysql.com
be7c5c1900
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-15 20:07:31 +02:00
joreland@mysql.com
59ce529b15
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/jonas/src/mysql-5.1
2005-06-13 15:16:15 +02:00
joreland@mysql.com
84a04b4a9d
merge
2005-06-13 14:09:09 +02:00
georg@lmy002.wdf.sap.corp
b64e6db5a4
fixes for windows 64-bit compiler warnings
2005-06-13 12:41:15 +02:00
joreland@mysql.com
5e4ce743a3
Merge mysql.com:/home/jonas/src/wl1882
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-13 11:59:51 +02:00
ndbdev@dl145b.mysql.com
8d44b54295
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-10 07:22:27 +02:00
jimw@mysql.com
153f233627
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-09 19:27:45 -07:00
jimw@mysql.com
3c425f1f65
Merge mysql.com:/home/jimw/my/mysql-4.1-10931
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:02:04 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
5708d9a076
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-06-09 21:54:06 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9f3daa2371
Fixes in function modify_defaults_file():
...
- Removed unneccessary variables.
- Made a function of that part of code, which actually changes
the line under modifications.
- Fixed memory overrun problem with my_malloc. Too little space
was reserved.
- Fixed problem in case, when new option was added at the end
of the section. Before, it was added as the last line of the
section, even if it left empty lines between.
- Fixed so that the configuration file is not saved unneccessarily,
if no modifications are done. (file timestamp remains)
- This should fix (at least partially) problems described in
Bug#10806
2005-06-09 21:50:22 +03:00
acurtis@xiphis.org
3b8c3bd7e1
Merge
2005-06-09 17:15:06 +01:00
ramil@mysql.com
90ddbe87d6
a fix (bug #11193 : error messages gets garbled after reggies latest changeset: ChangeSet@1.2260.1.).
2005-06-09 13:13:02 +05:00
reggie@mdk10.(none)
e23f249187
improved mapping from numerical open codes to string fopen codes.
...
This was necessary because the old code would return
"w+" for O_RDONLY|O_SHARE for example.
2005-06-07 15:45:03 -05:00
svoj@mysql.com
7e44f6f591
WL#2466 - Fulltext: "always-index" words
...
Trie and Aho-Corasick code added to distribution.
2005-06-07 21:17:09 +05:00
joreland@mysql.com
5be3eecc42
Add "--instance=name" option to load_defaults (or env(MYSQL_INSTANCE))
...
which enables having multiple mysqld in same my.cnf
without mysql_multi or IM
2005-06-07 16:52:50 +02:00
ndbdev@dl145b.mysql.com
2fb1fb5877
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 06:50:50 +02:00
ndbdev@dl145b.mysql.com
161a58ab4b
merge
2005-06-06 23:39:19 +02:00
monty@mysql.com
775f17667b
Merge with 4.1
2005-06-07 00:31:53 +03:00