Commit graph

7579 commits

Author SHA1 Message Date
vva@eagle.mysql.r18.ru
a135907547 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
2004-03-10 23:35:40 +04:00
vva@eagle.mysql.r18.ru
faa9c92765 fixed BUG #2874 "Grant table bug" and
added tests for testing structure of mysql db
2004-03-10 22:54:07 +04:00
paul@ice.snake.net
025be296b2 Touch up error message. 2004-03-08 15:58:45 -06:00
paul@ice.snake.net
ae18d8d64c Patch for #3068: [Prompt without seconds when set from INI file].
(Fix hours/seconds always to display with two digits.)
2004-03-08 15:52:06 -06:00
guilhem@mysql.com
91370d96ed Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-08 14:47:49 +01:00
guilhem@mysql.com
2c31370a30 Fix for BUG#3081 "if an INSERT DELAYED is killed, it is binlogged as killed but it's not needed".
INSERT DELAYED works only for one-row inserts (in latest 4.0 versions
at least). So killing a delayed_insert thread does not spoil replication:
the rows which actually went into the table are exactly those listed
in the binlog. So when the delayed_insert thread is killed, don't log
it as 'killed', because it causes superfluous stops on the slave.
2004-03-08 14:47:13 +01:00
monty@mysql.com
73780de129 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-06 10:43:53 +02:00
monty@mysql.com
ef971bb604 Ensure that one can't from the command line set a variable too small. (Bug #2710)
Allow one to force lower_case_table_names to 0, even if the file system is case insensitive. This fixes some issues on Mac OS X (Bug #2994)
Added variables "lower_case_file_system", "version_compile_os" and "license"
2004-03-06 10:43:35 +02:00
bell@sanja.is.com.ua
4c78e46351 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-03-04 20:30:29 +02:00
jani@ua72d24.elisa.omakaista.fi
34a332c086 Added option chroot to mysqlhotcopy.
Useful in case mysqld was started with chroot.
2004-03-04 18:30:28 +00:00
jani@ua72d24.elisa.omakaista.fi
58869cfe9a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2004-03-04 17:58:59 +00:00
jani@ua72d24.elisa.omakaista.fi
58a978b900 Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok)
Setting insert delayed threads = 0 at mysql_init_command.
2004-03-04 17:58:36 +00:00
bell@sanja.is.com.ua
d03034d306 invalidation of locking for write tables (BUG#2693)
fixed linking query_prealloc_size to query cache presence
2004-03-04 18:32:55 +02:00
monty@mysql.com
b9c4ee353d Rollback UPDATE/DELETE statements on kill
nsure that rows in a multi-row INSERT DELAYED are inserted atomicly
2004-03-04 18:16:10 +02:00
guilhem@mysql.com
9c4b9e6df1 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-04 15:45:03 +01:00
guilhem@mysql.com
9beae2895f Fix for BUG#3063 "Don't mark an auto DROP TEMP TABLE as 'killed' in the binlog";
even if the thread was killed, we write the DROP with error_code=0.
This will remove unneeded stops on slave, and will lose nothing:
if a real update was killed, this real update will be logged with the
nonzero error code and will cause the stop on slave.
2004-03-04 15:44:24 +01:00
serg@serg.mylan
f8345cc617 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-04 14:48:28 +01:00
serg@serg.mylan
c4b55a2aea drop tables in windows-compatible order 2004-03-04 14:47:33 +01:00
heikki@hundin.mysql.fi
995b74ee0d srv0srv.c:
Protect the reading of the latest foreign key error explantion buffer with a mutex; in theory, a race condition could cause SHOW INNODB STATUS print garbage characters after the error info; remove the sprintf of the latest UNIQUE KEY error, since the buffer really was always empty
2004-03-04 15:32:16 +02:00
monty@mashka.mysql.fi
6fbf1efdc2 Indented comment properly 2004-03-04 10:57:30 +02:00
konstantin@mysql.com
08b11e2f66 WL#1510: "Implement support for "commercial" binaries on handshake":
- server-side variable 'license' added
2004-03-02 16:01:50 +03:00
guilhem@mysql.com
f074349917 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-01 15:17:06 +01:00
guilhem@mysql.com
bce65d4b76 Fix for BUG#3015
"(binlog, position) stored by InnoDB for a replication slave can be wrong".
This code contains conditional #if to distinguish between versions;
it should be merged into 4.1 and 5.0.
2004-03-01 15:15:58 +01:00
ulli@morbus.(none)
7b5020b215 Merge ubayer@bk-internal.mysql.com:/home/bk/mysql-4.0
into morbus.(none):/home/ulli/work/mysql-4.0
2004-03-01 11:24:10 +01:00
guilhem@mysql.com
e022ba6063 Fix for BUG#3017
"wrong Relay_Log_Pos if Rotate is in the middle of a transaction in relay log"
increment 'pending' instead of 'relay_log_pos'.
2004-03-01 00:46:31 +01:00
Greg@greg-laptop.
e175101a10 Fix problem with NT named pipes code (per e-mail thread). 2004-02-28 15:11:16 +01:00
Greg@greg-laptop.
f4ebcaff4d Changes to fix errors encountered in test builds on Windows. 2004-02-27 16:51:01 +01:00
heikki@hundin.mysql.fi
86932a0b79 row0upd.c:
Fix bug: in a FOREIGN KEY, ON UPDATE CASCADE was not triggered if the update changed a string to another value identical in alphabetical ordering, e.g., abc -> aBc
2004-02-27 16:54:16 +02:00
ulli@morbus.(none)
709a5d6a8b fix for bug #2905 -
"mysqladmin.c & co fail to use MYSQL_PORT as the default value of the TCP/IP port"
2004-02-26 19:09:49 +01:00
serg@serg.mylan
3d750efcb1 do not look for string characters "'` inside comments - bug#539 2004-02-26 01:05:04 +01:00
marko@hundin.mysql.fi
241c4d8c9f Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/m/mysql-4.0
2004-02-25 12:55:16 +02:00
marko@hundin.mysql.fi
75ad9e5caa trx0undo.c:
Removed bogus assertion
2004-02-25 12:44:53 +02:00
arjen@bitbike.com
fafc130b61 Inserted comment about lost root pwd procedure in Docs relying on command order in mysqladmin. 2004-02-25 09:46:43 +10:00
serg@serg.mylan
f75e125db1 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-24 23:10:13 +01:00
serg@serg.mylan
a9d58d3e96 --set-character-set and --character-sets-dir in myisamchk now work 2004-02-24 23:07:45 +01:00
heikki@hundin.mysql.fi
b35e1f01bb ha_innodb.cc:
Add diagnostic code to analyze an assertion failure in ha_innodb.cc on line 2020 reported by a user (Bug #2903)
2004-02-24 17:38:47 +02:00
heikki@hundin.mysql.fi
624dd4db7b ut0dbg.h:
If there is an assertion failur refer the user to section 6.1 of the InnoDB online manual about forcing recovery
2004-02-24 17:17:02 +02:00
Sinisa@sinisa.nasamreza.org
74dc9f16bb A fix for double free of memory in mysqlbinlog. 2004-02-23 14:02:32 +02:00
marko@hundin.mysql.fi
1c1ac1fd5c Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/m/mysql-4.0
2004-02-23 12:34:33 +02:00
marko@hundin.mysql.fi
568121c6ff configure.in:
Removed the unused odbc directory
2004-02-23 12:33:43 +02:00
guilhem@mysql.com
4352a6f0ea Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-02-22 11:30:58 +01:00
guilhem@mysql.com
5afaf4eaaa Complement to
ChangeSet 1.1616.23.1
Fix for BUG#1858 "SQL-Thread stops working when using optimize table".
A test for this.
2004-02-22 11:22:51 +01:00
monty@mashka.mysql.fi
ae6599d5b9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2004-02-22 10:52:43 +02:00
monty@mashka.mysql.fi
fa882fd73c Move tests that uses innodb to innodb.test 2004-02-22 09:58:51 +02:00
monty@mashka.mysql.fi
e74182fe52 Cleanups 2004-02-22 08:54:06 +02:00
serg@serg.mylan
815eba6ab9 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-22 00:20:09 +01:00
serg@serg.mylan
bcd14123bc ftb +(+(many -parens)) bug fixed 2004-02-22 00:19:36 +01:00
monty@mashka.mysql.fi
349358a95b Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2004-02-22 00:40:50 +02:00
monty@mashka.mysql.fi
fdc4a35c94 change that master_server_id is not a restricted word 2004-02-22 00:38:05 +02:00
Sinisa@sinisa.nasamreza.org
9c636d3beb Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-02-21 20:11:47 +02:00