shuichi@mysql.com
f0fb08dd79
Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
2005-05-05 10:46:14 -07:00
shuichi@mysql.com
720418fe46
Added cp932 character set
2005-05-05 10:36:17 -07:00
tulin@dl145b.mysql.com
ccac26a27a
logging_ok:
...
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
BUG#10287
2005-05-04 10:16:03 +02:00
evgen@moonbone.local
b11705a2b0
Fix bug #9703 "Error 1032 with GROUP BY query and large tables"
...
Reset old error if tmp table was successfully created.
Test data is large and can be found in bug report along with test query.
2005-04-29 21:19:39 +04:00
acurtis@xiphis.org
e82edda6c6
Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
...
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
2005-04-08 21:40:50 +01:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f
Fix for bug #9286 : SESSION/GLOBAL should be disallowed for user variables
2005-04-06 14:13:06 +05:00
gbichot@quadita2.mysql.com
19499229ed
"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
...
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
2005-03-23 19:19:36 +01:00
gbichot@quadxeon.mysql.com
7ee2ecbe5d
Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
...
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon
2005-03-17 17:00:44 +01:00
gbichot@quadxeon.mysql.com
3cb85a4740
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
2005-03-17 15:51:52 +01:00
gbichot@quadxeon.mysql.com
d823bee92a
safer creation of temp files used in replication of LOAD DATA INFILE.
...
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.
2005-03-17 14:39:39 +01:00
paul@snake-hub.snake.net
4af3c8a23a
mysql.1.in:
...
Fix path that needs no parameterization.
2005-03-14 19:59:00 -06:00
reggie@mdk10.(none)
75e1b9e765
Bug #6660 mysqldump creates bad pathnames on Windows
...
This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows. However, this patch fixes the bug in mysqldump.c
mysqldump.c:
Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
2005-03-14 16:47:35 -06:00
msvensson@neptunus.(none)
13ec961c3a
BUG#6554 Problem Building MySql on Fedora Core 3
...
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
2005-03-14 12:07:49 +01:00
georg@lmy002.wdf.sap.corp
473f2f9409
New Project files for Windows Ithanium 64-bit builds
2005-03-06 14:22:28 +01:00
igor@linux.local
6d7862aeaf
logging_ok:
...
Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
Added a test case for bug #8893 .
opt_sum.cc:
A misplaced initialization for the returned parameter
prefix_len in the function find_key_for_maxmin caused
usage of a wrong key prefix by the min/max optimization
in cases when the matching index was not the first index
that contained the min/max field.
2005-03-04 20:24:13 -08:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 13:00:00 +02:00
dean@mysql.com
ace1d892f0
Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
...
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-15 17:30:40 -06:00
dean@mysql.com
c962d060ac
ft_nlq_search.c:
...
Added bounds check to avoid accessing unallocated FT_DOC array. (BUG #8522 )
2005-02-15 17:27:23 -06:00
svoj@mysql.com
643b602832
Bug#8351
...
Fix for crash when using a double quote in boolean fulltext query.
2005-02-14 18:54:12 +04:00
ramil@mysql.com
0d7228fff2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1
2005-02-04 15:53:14 +04:00
ramil@mysql.com
f76ccd63cb
type_float.result.es updated.
2005-02-04 15:35:08 +04:00
ramil@mysql.com
611e0e3e82
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/usr/home/ram/work/4.0
2005-02-04 13:59:13 +04:00
mikael@orca.ndb.mysql.com
0bb030a145
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1
2005-02-03 21:13:28 +01:00
brian@zim.(none)
630e020d3e
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-01-31 11:03:57 -08:00
tulin@mysql.com
bc317a19ce
BUG#8208 don't fsync unless something has been written
...
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1
2005-01-31 11:47:10 +01:00
brian@zim.(none)
b484e29231
Cleanup for lost file descriptors on close table for ha_archive.
2005-01-28 16:43:10 -08:00
reggie@bob.(none)
da9f7c7ec4
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bob.(none):/home/reggie/bk/mysql-4.1
2005-01-17 14:08:36 -06:00
kaa@polly.local
c46f527454
Fixed memory leak in handle_local_infile()
2005-01-17 19:21:01 +03:00
reggie@bob.(none)
68c540f090
Bug #7922 prompt \p fails on Windows for shared-memory connections
...
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.
mysql.cc:
Added code to display mysql.host as prompt when using shared memory
2005-01-15 23:19:34 -06:00
paul@snake-hub.snake.net
fc0d550bad
set_var.cc:
...
Silence compiler warning.
2005-01-02 15:10:08 -06:00
mskold@mysql.com
76b2df6043
Merged bugfix
2004-12-30 21:36:16 +01:00
marty@linux.site
1ddb554b8b
Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser
2004-12-30 19:56:09 +01:00
paul@frost.snake.net
adfb20f64a
fill_help_tables.sh:
...
Convert @samp{c} to 'c', not c.
2004-12-18 14:22:20 -06:00
matt@booty.(none)
35942c09de
my-innodb-heavy-4G.cnf.sh:
...
I fixed the typos in the transaction-isolation comments.
I fixed the spelling mistakes in the comment. It had tripped up a support
customer as they couldn't start the server with transaction-isolation=
read-commited
2004-12-17 22:25:35 -05:00
joreland@mysql.com
cfa20fbaa6
merge
2004-12-17 10:36:14 +01:00
joreland@mysql.com
50e15affff
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/wl1744
2004-12-06 14:52:31 +01:00
stewart@mysql.com[stewart]
00915656e7
Add (optional) endian parameter to 'get nodeid' to warn on endian conflicts.
2004-12-06 11:41:16 +11:00
jimw@mysql.com
4b8e96d5ca
Merge
2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae
Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
...
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682 )
(Original fix reimplemented after review by Serg and Guilhem.)
2004-12-03 00:05:11 +01:00
mwagner@mysql.com
2e0d1b3f9c
openssl_1.result, have_openssl_1.require, openssl_1.test:
...
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
2004-12-01 02:35:02 +01:00
timour@mysql.com
f1e86036ee
Merge mysql.com:/home/timka/mysql/src/4.0-virgin
...
into mysql.com:/home/timka/mysql/src/4.0-master
2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c
Merge
2004-11-25 12:23:41 +01:00
timour@mysql.com
38ab93c6be
Merge for BUG#3759 which was missing from the main tree for some reason.
2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e
Merge mysql.com:/space/bkroot/mysql-4.0
...
into mysql.com:/space/bk/b6148-mysql-4.0
2004-11-25 09:38:52 +01:00
petr@mysql.com
edc868e397
Added --disable-log-bin option to the mysqlbinlog (WL1787)
2004-11-19 18:35:36 +03:00
timour@mysql.com
5d1f920ba7
correct name of function in synopsis
2004-11-18 16:52:45 +02:00
joreland@mysql.com
f63b126f7e
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/wl1744
2004-11-15 10:50:58 +01:00
monty@mysql.com
9252656d49
merge with 4.0
2004-11-12 11:17:53 +02:00
Administrator@w2k.
414298f38b
Merge joreland@bk-internal.mysql.com:wl1744 into w2k.:C:/mysql-4.1
2004-11-10 14:02:59 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
083a2f5613
Changed default.c so that it now checks for my.ini and then
...
my.cnf from the default directories.
2004-11-05 18:59:19 +02:00