Commit graph

2642 commits

Author SHA1 Message Date
guilhem@mysql.com
e2151132a0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-04-03 20:19:15 +02:00
guilhem@mysql.com
f33c6e7c83 More honest --master-ssl* options description. As these do nothing
yet, better say it and see no traffic on bugs@ and support@.
2003-04-03 20:19:14 +02:00
heikki@hundin.mysql.fi
9a5578af57 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2003-04-03 21:19:14 +03:00
guilhem@mysql.com
8611c34e5e Explicit message to warn that logging (e.g. binary) is permanently turned off
because of writing problems (such message would have been useful during a recent
support task).
2003-04-03 20:19:13 +02:00
heikki@hundin.mysql.fi
8aa7532990 log.cc:
Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled
2003-04-03 21:19:13 +03:00
monty@narttu.mysql.fi
aa4bf1cd8d After merge fix 2003-04-03 21:19:11 +03:00
Sinisa@sinisa.nasamreza.org
10957fb0f3 One test case, one bug fix and one new feature 2003-04-03 20:24:15 +03:00
monty@narttu.mysql.fi
d56dc85205 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 19:55:37 +03:00
vva@eagle.mysql.r18.ru
04b81ac9ac Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 12:55:36 -04:00
vva@eagle.mysql.r18.ru
f45be5e6cd added test for replication load data into temporary table with additional options 2003-04-03 12:54:08 -04:00
vva@eagle.mysql.r18.ru
4fb9cb0097 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 10:30:41 -04:00
monty@narttu.mysql.fi
8f957e6ab5 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-04-03 13:08:28 +03:00
monty@narttu.mysql.fi
e96c75fec0 Fixed bug in memory allocation that could affect 64 bit systems (affected hammer) 2003-04-03 13:07:42 +03:00
monty@narttu.mysql.fi
618857b6eb Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
2003-04-03 12:33:13 +03:00
monty@narttu.mysql.fi
3cdc8ae55b Portability fix (for AMD hammer) 2003-04-03 12:10:38 +03:00
monty@narttu.mysql.fi
bf315f30d5 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 11:29:38 +03:00
monty@narttu.mysql.fi
c1ff07cbb9 Safer stack checking 2003-04-03 11:29:10 +03:00
Sinisa@sinisa.nasamreza.org
c588cf6889 A fix for a bug in multi-table updates which was always caused
whenever a temporary MyISAM table had to be created from HEAP table.
2003-04-02 17:05:34 +03:00
guilhem@mysql.com
4824d6c66c Sprint task #856 : make table exclusion rules (in replication)
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
2003-04-01 22:49:40 +02:00
guilhem@mysql.com
1211b9a513 Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is well
logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.
2003-04-01 18:19:15 +02:00
Sinisa@sinisa.nasamreza.org
6e49edda92 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-31 15:23:27 +03:00
bell@sanja.is.com.ua
4d87fd0346 fixed bug 209 (SQL_SELECT_LIMIT and query cache incompatibility) 2003-03-31 09:49:09 +03:00
bell@sanja.is.com.ua
63cb565895 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-03-30 17:16:39 +03:00
hf@deer.mysql.r18.ru
deca14ebde truncating REPLACE result bug fix 2003-03-30 18:36:01 +05:00
Sinisa@sinisa.nasamreza.org
f5c9611a66 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-28 17:58:30 +02:00
bell@sanja.is.com.ua
439ac36d52 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-4.0
2003-03-28 15:36:42 +02:00
monty@mashka.mysql.fi
7f2fb977a2 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-03-27 13:54:22 +02:00
heikki@hundin.mysql.fi
034d02f55b mysqld.cc:
Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction
2003-03-27 12:17:27 +02:00
bell@sanja.is.com.ua
a5222e1c69 fixed problem of port without host in SHOW PROCESSLIST (bug 189) 2003-03-26 22:04:20 +02:00
Sinisa@sinisa.nasamreza.org
453299b185 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-26 16:28:59 +02:00
monty@mashka.mysql.fi
ff12a11829 Fix for stack size checking on Solaris. 2003-03-26 14:51:22 +02:00
monty@mashka.mysql.fi
a34bc8eef7 Fix for glibc with small stack size (fixes bug when running crash-me) 2003-03-26 14:11:17 +02:00
vva@eagle.mysql.r18.ru
af61a4c7fa Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-03-25 19:58:40 -04:00
vva@eagle.mysql.r18.ru
e1173e70a5 fix bug with parameters of LOAD DATA INFILE in exec_event 2003-03-25 19:57:38 -04:00
guilhem@mysql.com
cc899529dc Fix for small bug #186 (If a connection has temporary tables and does
RESET MASTER, this breaks replication).
In the slave SQL thread, any DROP TEMPORARY TABLE is silently
converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant
"table does not exist". See comments in code or bug #186 for an example
of how irrelevant errors like this can arise.
2003-03-25 16:52:48 +01:00
monty@narttu.mysql.fi
a71abe822d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-25 13:07:02 +02:00
monty@narttu.mysql.fi
9a7b0ef83d Fixed bug with GROUP BY and alias 2003-03-25 13:06:20 +02:00
monty@narttu.mysql.fi
8b5ce819db Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME; 2003-03-24 23:24:45 +02:00
Sinisa@sinisa.nasamreza.org
8c36b3b4ec A fix for bug #176
code cleanup
2003-03-24 22:52:46 +02:00
Sinisa@sinisa.nasamreza.org
4b1a877b23 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-24 15:00:32 +02:00
jani@rhols221.adsl.netsonic.fi
c7f224ca51 Reverted fix away from 4.0, because it may in rare circumstanses
cause compatibility problems. Fix will be enabled in 4.1.
2003-03-23 11:30:45 +02:00
jani@hynda.(none)
6112e67d64 Added error in case auto_increment and default where defined
at the same time.
2003-03-22 19:55:09 +02:00
guilhem@mysql.com
17537ba797 Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.
2003-03-22 15:22:59 +01:00
bell@sanja.is.com.ua
2a410e95db Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/work-qcfile-4.0
2003-03-21 10:03:43 +02:00
pem@mysql.com
0694d567f0 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2003-03-20 10:04:37 +01:00
monty@narttu.mysql.fi
584729430a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-19 21:56:14 +02:00
monty@narttu.mysql.fi
68ca84dbd1 Print right hostname or IP in SHOW PROCESSLIST
Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists
2003-03-19 21:43:41 +02:00
Sinisa@sinisa.nasamreza.org
8757ab3279 Fixed a bug when SELECT @@inexistent_variable caused the
error in client - server protocl due to two net_printf() being
sent to the client.
2003-03-19 17:46:36 +02:00
Sinisa@sinisa.nasamreza.org
f2b5f00563 A fix for the bug with setting of SQL_BIG_SELECTS option. 2003-03-19 17:25:59 +02:00
Sinisa@sinisa.nasamreza.org
8d5fae86c7 A fix for SHOW PROCESSLIST bug 2003-03-19 16:10:16 +02:00
pem@mysql.com
9bdeb7782a Fixed lots of typos, and translated a few messages. 2003-03-19 14:04:30 +01:00
lenz@mysql.com
ad32b455bc Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-03-19 13:40:24 +01:00
monty@narttu.mysql.fi
056e88fe24 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-19 00:47:38 +02:00
monty@narttu.mysql.fi
386411b5ba Allow optimzation of multi-table-update also for InnoDB tables
MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times
2003-03-19 00:45:44 +02:00
lenz@mysql.com
04071da35a - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)
2003-03-18 22:14:02 +01:00
monty@narttu.mysql.fi
c2fa342d53 Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables 2003-03-18 03:19:20 +02:00
monty@narttu.mysql.fi
052edd98d4 Test of range optimizer in InnoDB 2003-03-18 03:16:12 +02:00
monty@narttu.mysql.fi
85de222334 Fix of 'halloween bug' with UPDATE of InnoDB tables. 2003-03-18 02:51:16 +02:00
guilhem@mysql.com
87e1c552ed New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small. This fixes bug #79.
2003-03-17 22:51:56 +01:00
monty@narttu.mysql.fi
3ec97824b7 Change dbug.h -> my_dbug.h (Portability fix)
Ensure that \ is not allowed in filenames, even on Unix
2003-03-17 19:06:14 +02:00
monty@mashka.mysql.fi
b879a40120 Write binlog before commit when doing INSERT ... SELECT 2003-03-16 16:28:30 +02:00
monty@mashka.mysql.fi
968e9a73d4 merge with 3.23 to get:
- Fix for empty table/column names
2003-03-15 04:41:57 +02:00
monty@mashka.mysql.fi
a6482b1304 Code cleanup 2003-03-15 04:34:06 +02:00
monty@mashka.mysql.fi
369da47836 Code cleanup 2003-03-14 23:06:55 +02:00
monty@mashka.mysql.fi
2cb3a5d264 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-14 17:11:38 +02:00
monty@mashka.mysql.fi
5ee1dbbe58 Check for empty table/column names 2003-03-14 17:08:42 +02:00
heikki@hundin.mysql.fi
613daa0d21 ha_innobase.cc:
Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
2003-03-13 23:10:50 +02:00
heikki@hundin.mysql.fi
bd14136331 ha_innodb.cc:
Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
2003-03-13 23:09:25 +02:00
serg@serg.mysql.com
860e8099ab Merge 2003-03-13 18:51:50 +01:00
serg@serg.mysql.com
ff86765a4d fix for crash with small sort_buffer 2003-03-13 18:46:40 +01:00
serg@serg.mysql.com
f590fa7ce2 merged 2003-03-13 17:57:24 +01:00
monty@mashka.mysql.fi
6c81552dd3 Better fix for GRANT bug 2003-03-13 16:43:43 +02:00
serg@serg.mysql.com
1608ce3c52 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-13 14:47:58 +01:00
lenz@mysql.com
ced5770aba - fixed newly added DBUG_RETURN to DBUG_VOID_RETURN (compile failed with
"DBUG_RETURN undeclared" on Mac OS X)
2003-03-13 13:52:15 +01:00
serg@serg.mysql.com
026ec1d37c merged 2003-03-13 13:44:03 +01:00
serg@serg.mysql.com
a4241f92cc Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-13 11:23:34 +01:00
serg@serg.mysql.com
e10fd44489 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-13 10:53:58 +01:00
serg@serg.mysql.com
9b604c88d0 better help message 2003-03-13 01:23:43 +01:00
bell@sanja.is.com.ua
91fc15fc6d added comment 2003-03-12 22:50:22 +02:00
serg@serg.mysql.com
b3c600cdbc ha_myisam.cc:
typo fixed
2003-03-12 18:32:27 +01:00
Sinisa@sinisa.nasamreza.org
32a636c078 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-12 17:23:23 +02:00
Sinisa@sinisa.nasamreza.org
77eb6e5063 Better fix for "Halloween" effect ... 2003-03-12 17:11:48 +02:00
Sinisa@sinisa.nasamreza.org
d87036511b Fix for a bug with column privileges ... 2003-03-12 17:08:48 +02:00
monty@mashka.mysql.fi
a4616a92d8 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-12 16:43:37 +02:00
monty@mashka.mysql.fi
88f811c8a5 NEWDATE -> DATE in anylyse() output
Changed that analyse(#) also affects strings
2003-03-12 16:43:01 +02:00
Sinisa@sinisa.nasamreza.org
51e5344dfe Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-12 14:48:00 +02:00
monty@mashka.mysql.fi
fef194fcb8 Fix for --new option (Timestamp in YYYY-MM-DD HH:MM:SS format) 2003-03-12 14:34:54 +02:00
monty@mashka.mysql.fi
d57c2019d1 Proper fix for INSERT DELAYED and --max-delayed-threads 2003-03-12 08:08:07 +02:00
monty@mashka.mysql.fi
47ec22d83f Fix for replication of INSERT | REPLACE | CREATE ... SELECT 2003-03-12 07:51:08 +02:00
monty@mashka.mysql.fi
061e673c9b Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-03-12 05:21:31 +02:00
guilhem@mysql.com
209e526af7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-03-12 01:06:21 +01:00
guilhem@mysql.com
1434bc5db1 Fix for bug #136. We must write the
INSERT into u SELECT * from t
to the binlog
BEFORE unlocking t (which was read-locked at least in MyISAM),
and not the contrary.
2003-03-12 01:05:04 +01:00
monty@mashka.mysql.fi
8edc752573 Simple fixes (nothing notable) 2003-03-12 01:40:06 +02:00
bell@sanja.is.com.ua
bc040b5552 Merge sanja.is.com.ua:/home/bell/mysql/mysql-3.23
into sanja.is.com.ua:/home/bell/mysql/work-rand-3.23
2003-03-11 22:38:32 +02:00
serg@serg.mysql.com
5585d1b6fd Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-11 21:21:11 +01:00
serg@serg.mysql.com
77dd897ead fixed an obscure bug in group by + having + Item_ref::get_date 2003-03-11 21:20:53 +01:00
monty@mashka.mysql.fi
7fdf7a4101 merge with 3.23 to get:
- Better detection of crashed .MYI file
- Ignore writeable config files
2003-03-11 21:45:39 +02:00
Sinisa@sinisa.nasamreza.org
4cdc097aaa Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-11 20:09:49 +02:00
Sinisa@sinisa.nasamreza.org
40c744a3ac A bug fix for multi-table updates with InnoDB storage engine 2003-03-11 19:40:49 +02:00
bell@sanja.is.com.ua
b283e08cf3 fixed bug of unchecked random part of WHERE clause (bug #142) 2003-03-11 18:34:00 +02:00
lenz@mysql.com
a355f74bf7 - fixed C++-style comments in .c files to make IBM compiler happy
(it barfs on these with a syntax error)
2003-03-11 15:37:31 +01:00
Sinisa@sinisa.nasamreza.org
31248b1a77 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-11 15:40:09 +02:00
Sinisa@sinisa.nasamreza.org
873bc4976b Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-11 14:42:07 +02:00
Sinisa@sinisa.nasamreza.org
b1e28b5491 A fix for an obvious bug in hash generating proram. 2003-03-10 17:14:01 +02:00
Sinisa@sinisa.nasamreza.org
717455ba26 A fix for privilege checking bug. 2003-03-10 16:58:07 +02:00
lenz@mysql.com
2c849470e0 - typo fix for newly added error message 2003-03-10 13:41:37 +01:00
monty@narttu.mysql.fi
fae2711297 merge 2003-03-10 14:13:46 +02:00
monty@narttu.mysql.fi
6977704d2b after merge fixes 2003-03-10 13:54:20 +02:00
monty@narttu.mysql.fi
f1635f64f9 Merge with 3.23 to get fixes for --user and BACKUP TABLE 2003-03-10 12:48:43 +02:00
monty@narttu.mysql.fi
c231b747e3 Don't allow multiple --user options to mysqld
(First one is used)
2003-03-10 12:24:22 +02:00
monty@narttu.mysql.fi
e98a4473b4 Fix that round(0.1,1) == round(0.1,1) 2003-03-10 12:00:19 +02:00
monty@narttu.mysql.fi
9277579c96 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-03-10 11:23:11 +02:00
monty@narttu.mysql.fi
c43b3af78c Don't allow BACKUP TABLE to overwrite files
Fixed memory leak when replication restarts in debug mode
2003-03-10 11:22:37 +02:00
jani@rhols221.adsl.netsonic.fi
c5aadd2821 Made it possible to use --max-delayed-threads=0 in order to disable
INSERT DELAYED.
2003-03-09 19:03:55 +02:00
guilhem@mysql.com
c6f241636f Clearer error message when one forgot to grant REPLICATION SLAVE :
now we'll have something like this :
030308 18:46:58  Slave I/O thread: connected to master 'gb@localhost:3306',  replication started in log 'FIRST' at position 4
030308 18:46:58  While trying to obtain the list of slaves from the master 'localhost:3306', user 'gb' got the following error: 'Access denied. You need the REPLICATION SLAVE privilege for this operation'
030308 18:46:58  Slave I/O thread exiting, read up to log 'FIRST', position 4
instead of "Error updating slave list: Query error".
This fixes bug #80.
2003-03-08 18:53:32 +01:00
serg@serg.mysql.com
299999264e error messages translated by Egor 2003-03-07 15:22:05 +01:00
monty@mashka.mysql.fi
937241aded Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp() 2003-03-07 14:40:37 +02:00
serg@serg.mysql.com
dd1880be1e Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-07 11:58:07 +01:00
serg@serg.mysql.com
b755a87fb1 missing grant check added 2003-03-07 11:55:07 +01:00
monty@mashka.mysql.fi
c0c3a5f357 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-03-07 12:37:18 +02:00
monty@mashka.mysql.fi
987f4c4d8b Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
Some after merge fixes
2003-03-07 12:36:52 +02:00
monty@mashka.mysql.fi
d56e2acf50 Merge to get fix for LOCK TABLES + DROP TABLE in another thread 2003-03-07 01:20:56 +02:00
guilhem@mysql.com
6b40954a5e remove spaces according to coding rules 2003-03-06 22:53:58 +01:00
guilhem@mysql.com
0a8f3e19a5 Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug #104) 2003-03-06 22:46:24 +01:00
bell@sanja.is.com.ua
95c4b297b6 do not allow to cache queries with INTO clause 2003-03-06 17:37:12 +02:00
guilhem@mysql.com
ea4f0c383f Make log_pos be non-zero in the binary log, for BEGIN and COMMIT Query_log_events.
Now log_pos is the real position of the event. For events that are between BEGIN and COMMIT,
log_pos is still the BEGIN's log_pos.
This fixes bug #52 (If only transactions are run on the master then t
2003-03-06 16:22:31 +01:00
serg@serg.mysql.com
95af195d11 disable partial timestamps in --new mode 2003-03-06 10:54:27 +01:00
serg@serg.mysql.com
6897b00216 --new option and local variable to optionally turn on
"very new functions" - for now 4.1-compatible TIMESTAMT format
2003-03-05 18:43:56 +01:00
Sinisa@sinisa.nasamreza.org
c643298984 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-05 15:45:11 +02:00
Sinisa@sinisa.nasamreza.org
9034ed296b A better, but larger fix for server_id bug .. 2003-03-05 15:34:58 +02:00
lenz@mysql.com
908bf23cfc - Fixed URL to Using_stack_trace.html (the old one still works, but gets
redirected to the new location
2003-03-05 12:42:10 +01:00
serg@serg.mysql.com
887553913f Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-04 21:33:32 +01:00
heikki@hundin.mysql.fi
404116fd1d ha_innodb.cc:
Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated
2003-03-04 19:14:37 +02:00
heikki@hundin.mysql.fi
14749b89bb ha_innodb.cc:
Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash
2003-03-04 19:06:40 +02:00
serg@serg.mysql.com
e5daf6486c Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-03-04 18:03:11 +01:00
serg@serg.mysql.com
80c34b2aef fixed Field::eq() to work with CHAR(0) fields 2003-03-04 18:02:56 +01:00
Sinisa@sinisa.nasamreza.org
4d83bdef2a Fix for SHOW VARIABLES on 64-bit platforms 2003-03-04 18:23:15 +02:00
monty@narttu.mysql.fi
21cc72bfe8 Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread and DROP TABLE in another thread 2003-03-04 13:36:59 +02:00
monty@narttu.mysql.fi
28b6e0269a Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-03-04 12:32:28 +02:00
monty@narttu.mysql.fi
2a7dfa172c Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped 2003-03-04 12:22:35 +02:00
monty@narttu.mysql.fi
8c51eb2c12 Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another 2003-03-03 20:42:49 +02:00
heikki@hundin.mysql.fi
6ef0f4ad41 ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
2003-03-03 19:31:01 +02:00
Sinisa@sinisa.nasamreza.org
7dc464ea07 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-03 17:16:09 +02:00
guilhem@mysql.com
6b4f438ddb Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations)
+ fix for #70 
+ test result fix for LOAD DATA LOCAL bug #82
2003-03-03 14:57:02 +01:00
guilhem@mysql.com
49788cf2e1 ChangeSet 1.1625 was faulty as regards sql/mf_iocache.cc and LOAD DATA LOCAL replication tests 2003-03-02 18:20:32 +01:00
serg@serg.mysql.com
31d87cd50c optimizer should check for "field LIKE const" not "field like STRING" 2003-03-02 14:07:32 +01:00
serg@serg.mysql.com
d77cd3835d Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-02 01:52:02 +01:00
serg@serg.mysql.com
be580475be fix auto-increment in sub-key and insert ... select 2003-03-02 01:48:57 +01:00
guilhem@mysql.com
e66992aef5 Replication: simplification of init_relay_log_pos: always initialize,
remove variable rli->log_pos_current.
2003-03-02 00:45:19 +01:00
guilhem@mysql.com
10735252ee When the SQL thread cannot read an event from the relay log
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.
2003-03-02 00:34:44 +01:00
monty@narttu.mysql.fi
065bcf92fb Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-02-28 22:24:57 +02:00
monty@narttu.mysql.fi
e8aa21c8d3 LOAD DATA INFILE is not replicated if replicate_*_table is set
LOAD DATA LOCAL INFILE was not replicated correctly
2003-02-28 22:24:00 +02:00
bell@sanja.is.com.ua
e087f900e5 used correct function (SCRUM) 2003-02-28 21:17:44 +02:00
monty@narttu.mysql.fi
7eccd99e54 LOAD DATA INFILE is not replicated by slave if replicate_*_table is set 2003-02-28 19:50:05 +02:00
bell@sanja.is.com.ua
4352b9953a fixed SQL_SELECT option with UNIONs 2003-02-27 22:26:09 +02:00
bell@sanja.is.com.ua
47b16dae7a posreview changing (SCRUM)
increased compatibility
postmerge changing
2003-02-27 20:31:54 +02:00
bell@sanja.is.com.ua
80236063a1 merging 2003-02-27 19:38:39 +02:00
monty@narttu.mysql.fi
a0d2a621ed Added detection if pthread_attr_getstacksize() exists
Fixed bug in RAND() usage in mysqlbinlog
2003-02-27 17:35:51 +02:00
monty@narttu.mysql.fi
c20453ba9a Integer values between 9223372036854775807 and 9999999999999999999 are now
regarded as unsigned longlongss, not as floats. This make these values work
similar to values between 10000000000000000000 and 18446744073709551615.
2003-02-27 02:10:19 +02:00
monty@narttu.mysql.fi
61213dbc7a Code cleanup 2003-02-27 00:06:09 +02:00
monty@narttu.mysql.fi
39635eb212 Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-02-26 23:36:23 +02:00
monty@narttu.mysql.fi
56d0a23cd4 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-02-26 23:35:58 +02:00
heikki@hundin.mysql.fi
18dbed8463 ha_innodb.cc:
Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table
2003-02-26 19:52:31 +02:00
heikki@hundin.mysql.fi
f407468649 ha_innodb.cc:
Add docs to store_lock()
2003-02-26 19:31:05 +02:00
Sinisa@sinisa.nasamreza.org
1d09675c64 Merge sinisa@work.mysql.com://home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-02-26 15:33:20 +02:00
Sinisa@sinisa.nasamreza.org
571fc250ff A fix for a crashing bug with unspecified database in this type of
command:

load  data infile 'filename' into table db.table;
2003-02-26 15:28:28 +02:00
monty@narttu.mysql.fi
8df5705434 Fix for SHOW TABLE STATUS with empty .frm file 2003-02-26 10:16:50 +02:00
monty@narttu.mysql.fi
20f7ea5c7a Comment column in SHOW TABLE STATUS now reports that it can
contain NULL values (which is the case for a crashed .frm file).
2003-02-26 09:52:19 +02:00
monty@narttu.mysql.fi
326b8abc89 merge with 3.23 to get corrected error message files and rename of files in mysql-test 2003-02-26 00:22:35 +02:00
monty@narttu.mysql.fi
b4fbb06ad8 Portability fix for HPUX10.20 2003-02-25 21:43:24 +02:00
Sinisa@sinisa.nasamreza.org
471800ff48 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-25 16:09:47 +02:00
monty@mashka.mysql.fi
9812831194 Fixed "syntax" errors in text message files.
Ensured that all errors messages ends with: ",
2003-02-25 13:41:08 +02:00
monty@mashka.mysql.fi
4e2df79c36 Indentation cleanup 2003-02-25 11:05:07 +02:00
igor@hundin.mysql.fi
726e59827a opt_sum.cc:
Correction for min/max optimization of queries with outer joins
2003-02-23 04:27:03 +02:00
serg@serg.mysql.com
e7715445f3 ALTER TABLE closes all open HANDLER's for the table in question
fixed error handling in HANDLER ... READ FIRST
2003-02-22 18:00:34 +01:00
serg@serg.mysql.com
c954c15a63 do not allow COLUMN and AFTER/FIRST in
ALTER TABLE ... ADD KEY
2003-02-22 01:07:17 +01:00
Sinisa@sinisa.nasamreza.org
891a62eafb Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-21 16:23:44 +02:00
lenz@mysql.com
2b1f8fbe67 Reverted Sinisa's patch "Fixing the error messages returned on GRANT
commands" again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)
2003-02-19 16:16:27 +01:00
lenz@mysql.com
8a272349b9 Applied Sinisa's patch:
"A fix for non-releasing locks for multi table updates and multi
table deletes with InnoDB tables."
2003-02-19 15:08:29 +01:00
lenz@mysql.com
7a6d8edfd7 Applying Sinisa's patch:
"Cleaning the code of the remaining OLAP code.
This code is unnecessary in 4.1/5.0"
2003-02-19 14:58:44 +01:00
lenz@mysql.com
64b2048914 - Applying Sinisa's Patch "Fixing the error messages returned on
GRANT commands"
2003-02-19 14:50:40 +01:00
serg@serg.mysql.com
9d633d9a92 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-02-19 10:27:15 +01:00
heikki@hundin.mysql.fi
ed6a85b422 ha_innodb.cc:
Add comment about how to modify InnoDB to deal with partial-field prefixes of key value in the future
2003-02-18 20:07:06 +02:00
heikki@hundin.mysql.fi
e690ea09f7 page0cur.c:
Prepare for 5.x where HA_READ_PREFIX_LAST may pass only a few first bytes of the last field in a key value
ha_innodb.cc:
  In 4.0 always assume HA_READ_PREFIX_LAST passes a complete-field prefix of a key value; LIKE queries use a padding trick
2003-02-18 19:43:41 +02:00
bell@sanja.is.com.ua
d5cd5ea4e7 prevented crash on deleting non-constructed analyse object 2003-02-18 10:18:51 +02:00
bell@sanja.is.com.ua
d7316689fd Merge sanja.is.com.ua:/home/bell/mysql/mysql-3.23
into sanja.is.com.ua:/home/bell/mysql/work-3.23
2003-02-18 09:58:25 +02:00
bell@sanja.is.com.ua
352a338147 client port number added to SHOW PROCESSLIST (SCRUM?) 2003-02-17 22:07:26 +02:00
bell@sanja.is.com.ua
126e085749 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2003-02-17 17:11:11 +02:00
monty@mashka.mysql.fi
6051b2f998 Fixed multi-table-delete for InnoDB tables
Novell patches
2003-02-17 02:14:37 +02:00
monty@mashka.mysql.fi
153cefc61b Merge mashka.mysql.fi:/home/my/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-4.0
2003-02-17 01:07:29 +02:00
monty@mashka.mysql.fi
4c836e8d65 Fixed problem with ISNULL on fields that could not be null 2003-02-17 01:05:04 +02:00
bell@sanja.is.com.ua
05bbea4b25 fixed invalidation of query cache on LOAD DATA 2003-02-14 22:20:38 +02:00
bell@sanja.is.com.ua
203728ae68 fixed memory leak in ANALIZE initialization error reporting 2003-02-14 17:09:09 +02:00
serg@serg.mysql.com
5137c07ace another fix for RAND() initialization 2003-02-12 21:32:35 +01:00
Sinisa@sinisa.nasamreza.org
5376889e28 Fixed YES/NO in Polish messages 2003-02-12 20:42:46 +02:00
Sinisa@sinisa.nasamreza.org
82dd4cd580 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-12 15:13:23 +02:00
serg@serg.mysql.com
9dd13a9a4a backported MERGE+MAX bugfix from 4.0 2003-02-12 11:03:41 +01:00
serg@serg.mysql.com
92d6bdc1b6 backporting Peter's fix for better RAND() initialization from 4.0 2003-02-11 23:19:47 +01:00
monty@mashka.mysql.fi
fbc9cd7ee8 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-10 17:07:48 +02:00
monty@mashka.mysql.fi
78e7230e73 Better fix for count(distinct) bug 2003-02-10 17:03:27 +02:00
serg@sergbook.mysql.com
14b4b58de7 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-10 14:56:30 +01:00
serg@sergbook.mysql.com
3cc3ec177f error message fixed (new error code will be introduced in 4.1) 2003-02-10 14:47:39 +01:00
serg@sergbook.mysql.com
cba78f827c count(distint) on an empty table crash fixed 2003-02-10 12:01:47 +01:00
monty@mashka.mysql.fi
c0b655aa38 Fixed memory reference error when doing key_column <=> NULL on column that is defined as NOT NULL 2003-02-10 01:21:09 +02:00
Sinisa@sinisa.nasamreza.org
28489be4c0 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-08 20:00:11 +02:00
monty@mashka.mysql.fi
025dde7867 Check how much stack we got; Needed to be able to run crash-me 2003-02-08 01:55:16 +02:00
monty@mashka.mysql.fi
7391bc564f Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-07 18:01:08 +02:00
monty@mashka.mysql.fi
1b9b042654 Fix problem in MIN/MAX optimisation (from last patch)
Don't make OLD_PASSWORD() a reserved word
2003-02-07 17:57:07 +02:00
heikki@hundin.mysql.fi
7abed55936 ha_innodb.cc:
Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.
2003-02-07 17:33:15 +02:00
monty@mashka.mysql.fi
f68914addb Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-07 15:06:23 +02:00
heikki@hundin.mysql.fi
bd8c8522dc ha_innodb.cc:
Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition
2003-02-07 13:28:18 +02:00
monty@mashka.mysql.fi
564c447b27 Allow 4.0 to read new 4.1 .frm files 2003-02-07 10:35:08 +02:00
Sinisa@sinisa.nasamreza.org
c89c969b7c A fix for new conditions being defined and upper condition not updated 2003-02-06 18:50:12 +02:00
monty@mashka.mysql.fi
cf9668fd37 Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)
2003-02-06 16:55:59 +02:00
heikki@hundin.mysql.fi
a30d3cd847 ha_innobase.cc:
Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query
2003-02-05 01:42:07 +02:00
heikki@hundin.mysql.fi
a2de9c66f5 ha_innodb.cc:
Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place
2003-02-05 01:24:59 +02:00
monty@mashka.mysql.fi
59400e211f Fixed bug in ulonglong parsing for constructs that only takes unsigned longlong as parameter. 2003-02-04 01:05:39 +02:00
monty@mashka.mysql.fi
e3cd63521c Fix for MIN/MAX with empty tables
MIN(key_column) could in some cases return NULL on a column with NULL and other values.
MIN(key_column) and MAX(key_column) could in some cases return wrong values when used in OUTER JOIN.
2003-02-03 20:20:32 +02:00
monty@mashka.mysql.fi
c42e94a6e6 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-02 05:13:51 +02:00
monty@mashka.mysql.fi
a9ee051a4d Fixed core dump bug in 'mysql' when using \p in prompt on Windows.
Fixed error when mysql_unix_port pointed to const string (not uncommon on windows)
2003-02-02 05:13:09 +02:00
serg@serg.mysql.com
45ed0a0841 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-30 16:02:11 +01:00
monty@mashka.mysql.fi
9e3fd09305 merge with 3.23.56 to get patches for --lower-case-table-names and
proper handling of SUM() in some functions.
2003-01-29 19:22:22 +02:00
monty@mashka.mysql.fi
b025fa8b32 Fixed compilation error on windows 2003-01-29 19:10:33 +02:00
monty@mashka.mysql.fi
f2299ee72f Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-29 18:56:59 +02:00
monty@mashka.mysql.fi
d88eb71f34 Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump().
This fixes some Errcode 13 errors on Windows when deleting tables.
2003-01-29 18:56:34 +02:00
bell@sanja.is.com.ua
c6beb583f6 fixed functions to be able work with group function as argument
made bisone 1.75 compatible code
2003-01-29 10:38:56 +02:00
heikki@hundin.mysql.fi
d2328365e0 ha_innodb.cc:
Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT
2003-01-29 02:19:00 +02:00
heikki@hundin.mysql.fi
2db574ea19 ha_innodb.cc:
Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column
2003-01-29 00:31:56 +02:00
peter@mysql.com
91747f0e2c Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pz/mysql/mysql-4.0-root
2003-01-28 22:08:53 +03:00
monty@mashka.mysql.fi
7811a61b5d merge 2003-01-28 20:59:41 +02:00
monty@mashka.mysql.fi
3d28913740 Only write to the error log if --log-error is specified and --console is not specified
(On Windows --log-error is enabled by default)
2003-01-28 20:56:35 +02:00
peter@mysql.com
682cca2e75 Fix predicted first rand() call 2003-01-28 20:33:47 +03:00
serg@serg.mysql.com
1ced5948f0 low-level error messages cleanup 2003-01-28 17:42:08 +01:00
miguel@hegel.local
ce37b7aac4 Use on Unix hostname.err only when --log-error=path.
Asked by Heikki and Peter.
2003-01-28 13:50:36 -02:00
serg@serg.mysql.com
9199252c22 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-28 14:37:12 +01:00
serg@serg.mysql.com
4fb3244014 fixed "DROP table_open_in_handler" hang 2003-01-28 14:36:22 +01:00
monty@mashka.mysql.fi
6b71279382 merge 2003-01-28 09:02:51 +02:00
monty@mashka.mysql.fi
152f0603e7 Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()
2003-01-28 08:51:03 +02:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00
monty@mashka.mysql.fi
710ffb2d89 Fix when using auto_increment and last_insert_id() in the same insert statement. 2003-01-28 06:48:26 +02:00
serg@serg.mysql.com
52e440b9a7 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-28 00:57:13 +01:00
serg@serg.mysql.com
78f492b112 do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),
and VERSION() to be uppercase in e.g. "select pi()"
2003-01-28 00:55:41 +01:00
Administrador@light.
826993bba2 Added option hostname.err 2003-01-27 15:37:25 -02:00
lenz@mysql.com
82aca82da0 - added a dummy file "reservedwords.texi" to the BK tree and the Makefiles,
so it's part of the distribution (manual.texi includes this file)
   It will be replaced with the correct one from the mysqldoc tree before
   building the distribution
 - removed generation and inclusion of MIRRORS file, since the mirror list
   is no longer part of manual.texi anyway
 - replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
 - Redirect standard error when checking for dpkg-architecture in ltconfig
   to avoid error message showing during configuration
2003-01-27 13:44:16 +01:00
serg@serg.mysql.com
5f6b6fa3b3 fixes for SHOW VARIABLES and --ft-stopword-list 2003-01-27 12:12:12 +01:00
serg@serg.mysql.com
4b61ba5a89 ft_stopword_file added to 'SHOW VARIABLES' output 2003-01-27 11:15:54 +01:00
serg@serg.mysql.com
b031f5f43c Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-26 12:33:42 +01:00
monty@mashka.mysql.fi
1bdd1d0626 Merge with 3.23.55 2003-01-25 15:31:07 +02:00
monty@mashka.mysql.fi
fa7a94ed14 Added timeout for wait_for_master_pos
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
2003-01-25 15:07:51 +02:00
bell@sanja.is.com.ua
9ec97f2c08 fixed table invalidation in simple renaming 2003-01-24 01:54:39 +02:00