Commit graph

2605 commits

Author SHA1 Message Date
guilhem@mysql.com
f4c70678a8 Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-06 16:42:48 +02:00
guilhem@mysql.com
60fb005e5e Fix for bug 254 :
we now make a distinction between if the master is < 3.23.57, 3.23 && >=57, and 4.x
(before the 2 3.23 were one). This is because in 3.23.57 we have a way to distinguish between
a Start_log_event written at server startup and one written at FLUSH LOGS, so we
have a way to know if the slave must drop old temp tables or not.
Change: mi->old_format was bool, now it's enum (to handle 3 cases). However, functions
which had 'bool old_format' as an argument have their prototypes unchanged, because
the old old_format == 0 now corresponds to the enum value BINLOG_FORMAT_CURRENT which
is equal to 0, so boolean tests are left untouched. The only case were we use mi->old_format
as an enum instead of casting it implicitly to a bool, is in Start_log_event::exec_event,
where we want to distinguish between the 3 possible enum values.
2003-06-06 16:41:28 +02:00
heikki@hundin.mysql.fi
255a40c2f0 sql_yacc.yy, sql_parse.cc, sql_lex.h, mysqld.cc, lex.h:
Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.
2003-06-06 04:18:58 +03:00
guilhem@mysql.com
0058593c2d Test for bug 578. And a comment in slave.cc. 2003-06-05 17:02:00 +02:00
jani@ua126d19.elisa.omakaista.fi
d793db2bb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2003-06-05 16:57:36 +03:00
jani@ua126d19.elisa.omakaista.fi
058d8ed14b mysqld won't give a warning any more, if --user=user_name is used,
if 'user_name' is the current user and it is not root.
2003-06-05 16:56:38 +03:00
heikki@hundin.mysql.fi
e09517e2ac ha_innodb.cc:
Revert a change to dict_mem_index_add_field which slipped prematurely into the bk tree
2003-06-05 16:06:38 +03:00
heikki@hundin.mysql.fi
c2e5f48412 ha_innodb.cc, handler.cc:
Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB
2003-06-05 15:58:23 +03:00
monty@narttu.mysql.fi
4851b571bb Merged fix for alarm on big blocks 2003-06-05 15:21:10 +03:00
monty@narttu.mysql.fi
de0a3d3036 Fixed test if thr_alarm() failed 2003-06-05 15:15:27 +03:00
jani@ua126d19.elisa.omakaista.fi
9262cf2fb9 Merge jani@192.168.0.2:/my/mysql-4.0
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2003-06-05 15:07:28 +03:00
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
772adcbd99 Print error if we can't delete an alarm
More debugging variables
Increment aborted_threads in case of killed or too big packet
2003-06-05 12:29:13 +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