monty@mysql.com
eb83e8a046
Simplify code during review
2004-12-18 13:45:19 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1e07c1a6c1
Remove bogus lines
2004-12-18 02:34:11 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
3047649845
Bug#7391 - Multi-table UPDATE security regression
...
Add in missing privilege checks.
Tests for the privileges.
2004-12-18 02:07:32 +00:00
joerg@mysql.com
d54d79fae3
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2004-12-16 20:29:59 +01:00
joerg@mysql.com
587584f135
Have 'mysql-test-run' write a list of all failed tests at the end, if run with '--force'.
2004-12-16 20:26:24 +01:00
timour@mysql.com
cc6a30214c
Moved drop table statement to the end.
2004-12-16 18:44:39 +02:00
timour@mysql.com
53a9af8f1d
Test for BUG#6054. The bug itsel is fixed by the fix for #5837 .
2004-12-16 18:04:51 +02:00
marko@hundin.mysql.fi
cd8743409f
dict0load.c:
...
dict_load_table(): detect the new table format of MySQL 5.0.3
2004-12-13 12:31:17 +02:00
sergefp@mysql.com
0de1d4a9a9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/dbdata/psergey/mysql-4.0-bug6976
2004-12-11 20:02:45 +03:00
sergefp@mysql.com
f78a60593a
Fix for BUG#6976:
...
In Item_ref::Item_ref set maybe_null (and other fields fix_fields sets) to be the
same as in (*ref), because Item_ref::fix_fields() will not be called. Previously
maybe_null was 0 always and this produced a bogus state where
maybe_null==0 && is_null() == true
which broke evaluation for some upper-level Items, like AND and OR.
2004-12-11 19:59:09 +03:00
sergefp@mysql.com
6b55909673
Fix for BUG#5837 - attempt 3.
...
Call mark_as_null_row in join_read_const and join_read_system.
2004-12-11 15:51:52 +03:00
marko@hundin.mysql.fi
e8885a0824
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-12-10 23:33:55 +02:00
heikki@hundin.mysql.fi
ea6b5e117a
dict0dict.h, dict0dict.c, ha_innodb.cc:
...
Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
2004-12-10 17:12:47 +02:00
marko@hundin.mysql.fi
15152a380d
srv0srv.c:
...
srv_printf_innodb_monitor(): Removed extraneous rewind() call.
The caller of this function calls rewind() if necessary.
In this way, we avoid rewind()ing stderr in
srv_lock_timeout_and_monitor_thread().
2004-12-10 00:06:33 +02:00
serg@serg.mylan
5624eb7943
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-12-07 12:13:25 +01:00
serg@serg.mylan
f41779fa79
two fixes for potential security bugs
2004-12-07 12:08:20 +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
ram@gw.mysql.r18.ru
7ed2753300
A fix (bug #6878 : Crash with engine=memory).
2004-12-02 14:34:53 +04:00
guilhem@mysql.com
7219d2be90
two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
...
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.
2004-11-30 22:20:52 +01:00
marko@hundin.mysql.fi
d58c186759
srv0srv.c:
...
srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
only if --innodb_status_file=1
2004-11-26 13:16:37 +02:00
monty@mysql.com
eb304bd49f
Fixes while reviewing code
...
(Cleanups and better bug fixes)
2004-11-26 02:31:22 +02: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
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
mats@mysql.com
c06cae0f55
Fix for Bug#6148. Only rewind read position in binary log when the
...
slave SQL thread is started.
2004-11-25 09:26:45 +01:00
joerg@mysql.com
cf722bc3f5
Ensure consistent sources up to 5.0 where a C++ problem occurs.
2004-11-24 15:24:23 +01:00
joerg@mysql.com
134aa0b97b
Change "Do-compile" to make automatic build log analysis easier and
...
to run the standard tests with "--force" (default, can be switched off).
2004-11-23 17:18:41 +01:00
serg@serg.mylan
b7aa981578
"Table file %s was created in MySQL 4.1+" is an error, not a warning
2004-11-22 19:18:35 +01:00
serg@serg.mylan
eb8d9d3ffe
merged with ul
2004-11-22 18:59:17 +01:00
serg@serg.mylan
af51d26238
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-11-22 18:47:23 +01:00
serg@serg.mylan
dca2182fdc
ft_boolean_search.c:
...
bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
bug#6705
2004-11-22 18:37:30 +01:00
dlenev@mysql.com
40083741ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
2004-11-19 17:54:14 +03:00
guilhem@mysql.com
7743dbbb56
When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited
...
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.
2004-11-18 22:59:17 +01:00
serg@serg.mylan
2d8c21f700
test for bug#5528
2004-11-17 13:38:35 +01:00
heikki@hundin.mysql.fi
dd64377dc2
ha_innodb.cc:
...
Fix InnoDB bug #6287 : if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
2004-11-16 20:37:42 +02:00
dlenev@mysql.com
5ddc564d89
Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime
...
values for too big argument".
Added range checking for from_unixtime() argument, cleaned up code
a bit.
2004-11-15 16:11:13 +03:00
serg@serg.mylan
3d67df4cff
wrong constant fixed - boolean fulltext searches like "+something +smth*"
...
were stopping at docid 0xffffffff
2004-11-12 22:55:00 +01:00
paul@kite-hub.kitebird.com
79d8bde11e
Makefile.am:
...
Add -acc flag for texi2html to handle accented characters.
2004-11-12 14:15:06 -06:00
jani@ua141d10.elisa.omakaista.fi
76b8c8747d
Removed an unneccessary for() and variable.
2004-11-12 19:22:58 +02:00
ram@gw.mysql.r18.ru
77fe1baf1d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
2004-11-12 12:38:07 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
2ad7d5c662
Bug#6123 - GRANT USAGE creates useless mysql.db row
...
Prevent creation of a row which grants no rights
Test included
2004-11-11 20:59:03 +00:00
jani@a80-186-24-72.elisa-laajakaista.fi
54dac2cfac
Some code clean-up and optimization.
2004-11-11 16:59:36 +02:00
ram@gw.mysql.r18.ru
98df9313c0
A fix (bug #6564 : QUOTE(NULL) returns NULL, not the string 'NULL')
2004-11-11 18:20:40 +04:00
jani@a80-186-24-72.elisa-laajakaista.fi
4f04217879
Removed check for .ini file elsewhere, except on Windows.
2004-11-11 16:20:39 +02:00
paul@kite-hub.kitebird.com
dba07d0871
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
2004-11-10 08:56:49 -06:00
guilhem@mysql.com
609d7661a7
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-11-10 15:13:45 +01:00
guilhem@mysql.com
0c4363b6d0
Fix for BUG#6522 "Replication fails due to a rolled back transaction in the binlog"
...
When we are writing a transaction to the binlog, we log BEGIN/COMMIT with zero error code.
Example: all statements of trans succeeded, connection lost and so implicit rollback:
we don't want ER_NET* errors to be logged in the BEGIN/ROLLBACK events, while statement
events have 0. If there was really a serious error code, it's already in the statement events.
2004-11-10 15:07:55 +01:00
paul@kite-hub.kitebird.com
0d0ed072da
Alphabetize some out-of-order options in option structure.
...
Revise the --hex-blob help message string. (This will need
revising after merge to 4.1, too, but the CHAR BINARY and
VARCHAR BINARY data types will be BINARY and VARBINRY.)
2004-11-09 11:03:02 -06:00
bar@mysql.com
a83f8e60ab
mysql.h:
...
Adding a prototype for the new function.
2004-11-09 00:19:39 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
bfdf57ef31
Fixed a typo that caused segmentation fault when using
...
--defaults-extra-file option.
2004-11-05 23:58:30 +02:00