Commit graph

2593 commits

Author SHA1 Message Date
jani@ua126d19.elisa.omakaista.fi
4b55fbe092 Fixed a bug in concat_ws(), which did not add concat separator
in case of an empty string. Bug ID 586.
2003-06-05 15:06:19 +03:00
monty@narttu.mysql.fi
aeb655e04c Merge with 3.23 to get fix for thr_alarm and big packets 2003-06-05 12:00:06 +03:00
monty@narttu.mysql.fi
cd3b680db0 Fixed problem with alarms when reading too big packet 2003-06-05 11:55:03 +03:00
monty@narttu.mysql.fi
8ad4a240d2 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-04 23:17:45 +03:00
heikki@hundin.mysql.fi
42c80c81f7 handler.cc:
If the autocommit is on, let handler.cc commit or rollback the whole transaction at an updating SQL statement end. This probably fixes bug number 578. The problem was that when explicit LOCK TABLES is used, then the lock count method in autocommit does not work.
2003-06-04 17:58:41 +03:00
monty@narttu.mysql.fi
100a66e6cb Added [mysqld-base-version] as a default group for the mysqld server
Portability fix for Windows 64
2003-06-04 16:05:27 +03:00
guilhem@mysql.com
4a80a6c7b9 One-line fix for bug 576 (DBUG_ASSERT failure when using CHANGE MASTER TO RELAY_LOG_POS=4).
Plus a changeset which I had committed but forgot to push (and this changeset is lost on
another computer, so I recreate it here). This changeset is "user-friendly SHOW BINLOG EVENTS
and CHANGE MASTER TO when log positions < 4 are used.
2003-06-03 23:13:06 +02:00
guilhem@mysql.com
3b974039f7 -- Waiting for Monty's approval before push --
Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
if it was with IGNORE, do it with IGNORE,
if it was with REPLACE, do it with REPLACE,
and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
on the slave, i.e. a message where the keyname and key value appear :
'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
2003-06-03 15:47:29 +02:00
guilhem@mysql.com
4d5ae1d37c Clearer error message (in the customer's case, the relay log was corrupted,
not the master's binlog) (SW 1571).
2003-06-02 17:30:47 +02:00
monty@narttu.mysql.fi
f6a365a532 Small fixes (nothing nameworthy) 2003-06-01 23:40:01 +03:00
monty@narttu.mysql.fi
891d7ccd86 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-01 12:33:23 +03:00
monty@narttu.mysql.fi
02adbe6599 Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED. Bug #478 2003-06-01 12:32:53 +03:00
bell@sanja.is.com.ua
902415bf3c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2003-06-01 10:51:33 +03:00
bell@sanja.is.com.ua
2848e6c0d4 fixed bug 549 - incorect query cache memory formating on very small query cache sizes 2003-05-31 01:41:11 +03:00
gluh@gluh.mysql.r18.ru
3317cfdc7d Fix for compiling MySQL-4.0.13 with SSL support on OpenBSD 2003-05-30 18:41:19 +05:00
gluh@gluh.mysql.r18.ru
450f168bd4 Fix for bug #529 ("x509" no allowed as field name) 2003-05-29 14:52:25 +05:00
bar@bar.mysql.r18.ru
e546f33a1d item_cmpfunc.cc:
Fix for multibyte charsets
2003-05-28 11:24:48 +05:00
guilhem@mysql.com
eff179ba8f Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-05-27 18:19:32 +02:00
guilhem@mysql.com
cf3cda2778 Removed bad mutex locking 2003-05-27 18:16:50 +02:00
monty@narttu.mysql.fi
da05a3e3f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-27 16:40:39 +03:00
monty@narttu.mysql.fi
381492093e Fixed problem with mysql prompt when server disconnect. (Bug 356)
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case.  (Bug 316)
2003-05-27 16:40:14 +03:00
guilhem@mysql.com
97f9aa2aaf temporary update of the test to satisfy merge; will commit a final update
soon.
2003-05-27 14:50:14 +02:00
monty@narttu.mysql.fi
553637cbc4 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-05-26 20:35:27 +03:00
monty@narttu.mysql.fi
873033932a Fixed bug when installing mysqld as a service with 2 arguments (option + service-name) 2003-05-26 20:09:53 +03:00
monty@narttu.mysql.fi
1b14aa0d93 Merge with 3.23 to get fix for kill mysqld-pid 2003-05-26 17:55:49 +03:00
monty@narttu.mysql.fi
2c4a2cecda Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-05-26 17:29:32 +03:00
monty@narttu.mysql.fi
01de316fc2 Fixed problem with 'kill pid-of-mysqld' on Mac OS X 2003-05-26 17:24:16 +03:00
monty@narttu.mysql.fi
4ead61f873 code cleanup 2003-05-26 15:08:17 +03:00
monty@narttu.mysql.fi
17dfc88105 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-26 13:36:43 +03:00
monty@narttu.mysql.fi
48ecf0e8a7 Fixed core dump bug when shuting down mysqld 2003-05-26 13:10:08 +03:00
monty@narttu.mysql.fi
102c477760 Added testing of LOAD DATA ... STARTING BY
Added read_only variable
2003-05-26 11:47:03 +03:00
monty@mashka.mysql.fi
9f3ade0670 Added missing free for last patch 2003-05-26 06:16:50 +03:00
guilhem@mysql.com
9ed9ad5374 - Fix for memory leak if the SQL slave thread is killed just after reading an event.
- A few more mutex locks and unlocks of rli.log_space_lock for doing clean reads of
rli.ignore_log_space_limit
- Broadcast after unlock, not before (small speed optimisation).
2003-05-25 23:09:46 +02:00
heikki@hundin.mysql.fi
11ae9595c7 log.cc:
If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1
2003-05-25 23:37:32 +03:00
guilhem@mysql.com
8a1e18f4cb Fix for bug #490 and #491 (see details below) 2003-05-24 16:43:53 +02:00
guilhem@mysql.com
0b875e908f Fix for #468 [Ver]: SHOW VARIABLES trims innodb_data_file_path
(this bug was already fixed in 4.0, I just copied and pasted two lines).
2003-05-23 16:40:21 +02:00
vva@eagle.mysql.r18.ru
6b5c9851a4 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-3.23
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-3.23
2003-05-21 15:18:30 -04:00
vva@eagle.mysql.r18.ru
4ae8af4ae2 fixed "LINES STARTING" in load data replication 2003-05-21 15:16:56 -04:00
vva@eagle.mysql.r18.ru
d124cd5bd7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.0
2003-05-21 14:58:11 -04:00
vva@eagle.mysql.r18.ru
09348e271a fixed 'STARTING BY' in replication 2003-05-21 14:54:02 -04:00
monty@narttu.mysql.fi
fc0df599dc Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-19 12:02:11 +03:00
monty@narttu.mysql.fi
c01678bc3d Added option --read-only (Thanks to Markus Benning) 2003-05-19 12:01:38 +03:00
heikki@hundin.mysql.fi
5359d04608 buf0lru.c, buf0flu.c, buf0buf.c, buf0lru.h:
Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
trx0trx.c:
  Add forgotten return value (it was not used anywhere, fortunately)
ha_innodb.h, mysql_priv.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
2003-05-16 16:27:50 +03:00
monty@narttu.mysql.fi
dcb7b452bd Fixed bug in CREATE ... DECIMAL(-1,1). Bug #432 2003-05-14 22:12:55 +03:00
monty@narttu.mysql.fi
413bb98b5c SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables. (Bug #427) 2003-05-14 09:37:04 +03:00
monty@narttu.mysql.fi
d8a6c1ca22 Fix for checking global_access rights 2003-05-14 01:55:23 +03:00
monty@narttu.mysql.fi
717cbb6da1 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-14 01:28:59 +03:00
monty@narttu.mysql.fi
3e72b423e3 Fix for MacOSX and symlinks
Fix for USE_FRM and crashed index file
2003-05-14 01:27:26 +03:00
guilhem@mysql.com
6f9f6066f2 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-05-13 23:03:33 +02:00
guilhem@mysql.com
05c8973671 Fix for bug 343 : we require only REPLICATION CLIENT for
SHOW SLAVE STATUS and SHOW MASTER STATUS, because this is what
the manual states. We still accept SUPER.
2003-05-13 23:03:00 +02:00