monty@mashka.mysql.fi
045eb3d8fe
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-05 17:06:36 +03:00
monty@mashka.mysql.fi
75b2c4a62f
Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows.
2003-09-05 06:42:55 +03:00
serg@serg.mylan
be96cc0984
bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY
2003-09-03 22:27:04 +02:00
ram@mysql.r18.ru
5e6d8dd7fe
Fix for the bug #971 : ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column.
2003-09-02 21:09:28 +05:00
serg@serg.mylan
de627fde80
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-01 14:59:56 +02:00
serg@serg.mylan
b2c83e7f03
workaround for IN's special treatment of first argument. Not for 4.1
2003-09-01 14:18:27 +02:00
monty@narttu.mysql.fi
27e331c30a
Revert change of lower-case-table handling as this breaks how alias works.
...
Changes like this should be done to 4.1, not to a stable release
2003-08-29 04:17:30 +03:00
serg@serg.mylan
d09626d9d6
post-merge fixes
2003-08-28 13:14:54 +02:00
monty@narttu.mysql.fi
17d8cc22cb
merge with 3.23 to get for overrun in ISAM tables with man fields and a blob.
2003-08-28 12:35:36 +03:00
monty@narttu.mysql.fi
d5ed93e80e
Updated test for ISAM overflow bug
2003-08-28 12:28:51 +03:00
monty@narttu.mysql.fi
8a77f97079
Add detection of in_addr_t
...
Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update.
(This will probably solve bug #563 )
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support
2003-08-28 06:08:17 +03:00
monty@narttu.mysql.fi
fe9dc5e711
Add column names for metadata when running mysql with -T
...
Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324
2003-08-27 10:26:03 +03:00
monty@narttu.mysql.fi
66b160c253
vio ssl structure renames (to get rid of ending _)
...
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
2003-08-27 02:51:39 +03:00
monty@narttu.mysql.fi
2c1f1206c3
Better fix for myisamchk --sort-index on windows
...
Fixed deadlock bug when doing resize of key buffer while key buffer was in active use
2003-08-25 17:19:44 +03:00
Sinisa@sinisa.nasamreza.org
ced195f8a9
After merge fixes
2003-08-22 18:43:46 +03:00
Sinisa@sinisa.nasamreza.org
4d2902a27d
grant.result, grant.test, sql_acl.cc:
...
Fix for a bug #878
2003-08-22 18:32:11 +03:00
guilhem@mysql.com
9676fdcbcd
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-22 15:42:22 +02:00
guilhem@mysql.com
759a3c1e3c
2 minor edits, plus
...
fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
and
fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
Now we don't always write the non-trans update immediately to the binlog;
if there is something in the binlog cache we write it to the binlog cache
(because the non-trans update could depend on a trans table which was modified
earlier in the transaction); then in case of ROLLBACK, we write the binlog
cache to the binlog, wrapped with BEGIN/ROLLBACK.
This guarantees that the slave does the same updates.
For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
(because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
SAVEPOINT in the binlog.
Apart from this rare case of updates of mixed table types in transaction, the
usual way is still clear the binlog cache at ROLLBACK, or chop it at
ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
is fine).
Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
2003-08-22 15:39:24 +02:00
monty@narttu.mysql.fi
5192a58140
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-08-22 04:08:16 +03:00
monty@narttu.mysql.fi
efa85aad49
Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.
2003-08-22 04:07:40 +03:00
guilhem@mysql.com
ec280a51ca
Result updates after Dmitri's and my changes to logging with --log-slave-updates.
...
Since my changes, rpl_log.test, whose result file depends on file_id, became
non-repeatable, i.e. file_id on slave in SHOW BINLOG EVENTS
changed depending on the order of tests (sometimes 1, sometimes 5).
Which is logical: as now the slave does not copy Create_file and Exec_load from
the relay log (i.e from the master's binlog) to the slave's binlog, but
instead lets mysql_load() do the logging, the file_id is now the one whic
was used on the slave. Before it was the one which was used on the master,
and by chance the master was always restarted for this test because there's
a -master.opt file, so file_id on the master is always 1. But now file_id is
from the slave so we need to restart the slave. That's why I add an (empty)
-slave.opt file. I could have used 'server_stop/start slave', but this
would have required the manager, so most of the time mysql-test-run silently
skip the test which makes it useless. And I want this test to be run !
2003-08-21 00:23:39 +02:00
guilhem@mysql.com
f405287beb
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-20 23:25:58 +02:00
guilhem@mysql.com
1dd53ed073
First commit for fixing BUG#1100
...
"LOAD DATA INFILE is badly filtered by binlog-*-db rules".
There will probably be a second final one to merge Dmitri's changes
to rpl_log.result and mine.
2 new tests:
rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules,
rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates.
2003-08-20 23:24:45 +02:00
dlenev@mysql.com
319017ae9f
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1086
2003-08-20 17:25:45 +04:00
monty@narttu.mysql.fi
359846f052
Fixed some varnings from valgrind
...
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
2003-08-20 16:25:44 +03:00
Sinisa@sinisa.nasamreza.org
84c2e91f1e
sql_union.cc:
...
Fix for SQL_CALC_FOUND_ROWS in UNION's
2003-08-20 16:14:01 +03:00
Sinisa@sinisa.nasamreza.org
5ed6551601
func_test.result, func_test.test:
...
Test case for the LEAST() bug in LEFT JOIN
2003-08-20 15:52:43 +03:00
Sinisa@sinisa.nasamreza.org
fb774125e8
item_func.h:
...
Fix for a bug with LEAST() in WHERE clause
ha_innodb.cc:
Fix for a configure bug
multi_update.result, multi_update.test:
Fix for the update with NULL's in the result set
sql_update.cc:
Fix for the update with NULL's in the result set
Fix for the update with NULL's in the result set
Fix for the update with NULL's in the result set
2003-08-20 15:33:21 +03:00
dlenev@mysql.com
bb96092202
Fix for BUG#1086. Now we don't preserve event's log_pos through
...
log-slave-updates since this causes unexpected values in
Exec_master_log_pos in A->B->C replication setup, synchronization
problems in master_pos_wait()...
Still this brokes some functionality in sql/repl_failsafe.cc
(but this file is not used now)
2003-08-20 03:38:31 +04:00
monty@mashka.mysql.fi
0d01cc56bd
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-19 16:17:54 +03:00
monty@mashka.mysql.fi
ff63a5c3d9
Fix test case
2003-08-19 16:03:18 +03:00
bell@laptop.sanja.is.com.ua
39a65cd777
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-08-18 01:56:31 +03:00
monty@mashka.mysql.fi
a9146ace70
Cleanups to recent patches
...
Fix packet error when using wrong GRANT command
2003-08-15 09:54:19 +03:00
bell@laptop.sanja.is.com.ua
e9e5faacfe
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-08-15 00:17:43 +03:00
monty@mashka.mysql.fi
fb47e64256
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-13 13:26:52 +03:00
serg@serg.mylan
bc9f6cde50
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-12 15:30:47 +02:00
monty@mashka.mysql.fi
7782286faf
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-12 01:33:55 +03:00
monty@mashka.mysql.fi
2fb441fdf7
Remove wrong bug fix when calling create_sort_index.
...
Fix possible replication bug with LOAD DATA ... IGNORE LINES #
2003-08-10 05:14:16 +03:00
bell@sanja.is.com.ua
b41599de1c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merged_qc-4.0
2003-08-09 14:16:13 +03:00
serg@serg.mylan
083acc29bb
BETWEEN bug fix: non-const expressions on both ends
2003-08-09 01:20:02 +02:00
bell@sanja.is.com.ua
ddd3ee8b27
rewritten test using loop (BUG#930)
...
removed unused field (now it is in variables)
2003-08-08 23:27:22 +03:00
serg@serg.mylan
df8b7799cb
between range optimization bug (between with const on one end only)
2003-08-08 19:13:27 +02:00
serg@serg.mylan
f96d57d302
between tests added
...
bugfixes will follow
2003-08-08 18:49:22 +02:00
dlenev@build.mysql.com
38a5d1b70e
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/dlenev/mysql-4.0-certs
2003-08-08 15:03:42 +02:00
monty@mashka.mysql.fi
6e7a509d06
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-07 20:18:51 +03:00
monty@mashka.mysql.fi
8f08c511ee
Review of changesets since last pull.
...
(Mostly code cleanups)
2003-08-07 20:16:37 +03:00
dlenev@build.mysql.com
3f5faaaff9
openssl_1.result, openssl_1.test:
...
Aligned test with regenerated SSL certs
Many files:
Regenerated expired certificates
2003-08-07 15:20:15 +02:00
serg@serg.mylan
73bb79dbea
Bug #792 combination of date-interval and between with mixed constant and non-constant
2003-08-06 15:37:22 +02:00
serg@serg.mylan
3396c1a89d
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-05 16:30:22 +02:00
serg@serg.mylan
c0317ce66c
make it clear for optimizer that XOR's are not optimizable at the moment (BUG#992)
2003-08-05 16:29:09 +02:00
guilhem@mysql.com
bb12d905cb
2 bugfixes:
...
- Bug #985 : "Between RESET SLAVE and START SLAVE, SHOW SLAVE STATUS is wrong."
Now RESET SLAVE puts correct info in mi->host etc. A new test rpl_reset_slave
for that.
- Bug #986 : "CHANGE MASTER & START SLAVE do not reset error columns in SHOW
SLAVE STATUS". Now these reset the errors.
2003-08-04 10:59:44 +02:00
guilhem@mysql.com
41865cf3a6
Fix so that SET PASSWORD is not replicated by the slave if running with
...
replicate-*-table rules which exclude 'mysql' tables
(e.g. replicate-wild-ignore-table=mysql.%).
This was already the behaviour for GRANT/REVOKE, I'm extending it to
SET PASSWORD because it seems very logical (the contrary seems illogical).
2 new tests:
- one to test if GRANT and SET PASSWORD are replicated
- one to test if they are not replicated if replicate-wild-ignore-table=mysql.%
The 2nd is also a testcase for BUG#980.
2003-08-02 23:46:26 +02:00
serg@serg.mylan
5ac7f31b57
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-01 14:58:57 +02:00
serg@serg.mylan
fb5a1da621
bug #942 . docid == ftb->lastpos in join on looping over nested table
2003-07-31 13:45:35 +02:00
bell@sanja.is.com.ua
86e6cf399e
support of more then 255 tables dependence in query cache (fixed BUG#930)
2003-07-30 14:59:56 +03:00
guilhem@mysql.com
34352d0c21
Make rpl_insert_id.test use InnoDB, and added foreign keys to the table,
...
so that it really tests replication of SET FOREIGN_KEY_CHECKS (previously
it used MyISAM).
2003-07-26 17:59:05 +02:00
serg@serg.mylan
4e22494ebf
outer join, impossible on condition, where, and usable key for range
...
bug#926
2003-07-25 14:32:03 +02:00
Sinisa@sinisa.nasamreza.org
e08a00bd02
Fuller implementation of lower case table names.
...
Bug record #828
2003-07-23 17:36:56 +03:00
Sinisa@sinisa.nasamreza.org
40756106a9
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-07-18 14:14:20 +03:00
serg@serg.mylan
4784f60a3a
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-18 10:39:43 +02:00
monty@narttu.mysql.fi
7b8a54b512
Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR
2003-07-18 04:04:24 +03:00
serg@serg.mylan
6714563186
my_strnncoll_latin1_de rewritten from scratch. Bug with overlapping combos went away.
2003-07-17 20:17:46 +02:00
monty@narttu.mysql.fi
b1b73137de
Fixed wrong test in LOG::close
...
Fixed test for binary build
2003-07-14 23:49:19 +03:00
monty@narttu.mysql.fi
df7c1e8165
Better fix for bug #791 : At binlog rotation, INSERTs may not find their way into the binlog
2003-07-14 14:59:26 +03:00
ram@mysql.r18.ru
60c0fb7b4f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.r18.ru:/usr/home/ram/work/4.0
2003-07-14 12:40:13 +05:00
ram@mysql.r18.ru
8e23f54fec
backport fix for the bug #803 : INTERVAL(NULL, ....)
2003-07-14 12:39:10 +05:00
monty@mashka.mysql.fi
568e050ec9
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-07-14 10:18:04 +03:00
monty@mashka.mysql.fi
e1aa90a9bf
Safety and speedup fixes:
...
Changed is_open() to work as before.
Added back inited argument to LOG
2003-07-14 10:12:05 +03:00
ram@mysql.r18.ru
f7570df170
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.r18.ru:/usr/home/ram/work/4.0
2003-07-14 11:23:36 +05:00
lenz@mysql.com
8fcda6a5d5
- fixed an error in the rpl_error_ignored_table test suite: the master
...
port number can be different from 3306 when doing the release builds
with Do-compile, therefore it has to be replaced with the correct
value during the test run using the "--replace_result" function.
2003-07-11 22:18:53 +02:00
ram@mysql.r18.ru
4ca9718375
Fix for the bug #801 : create table t1 select x'41'; doesn't work
2003-07-11 14:17:18 +05:00
ram@mysql.r18.ru
df0f59fcbd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.r18.ru:/usr/home/ram/work/4.0
2003-07-11 13:29:25 +05:00
guilhem@mysql.com
2ca501f7ea
Fix for BUG#812
...
"mysqlhotcopy fails to copy tables but does not indicate a failure"
("does not indicate a failure");
this is about "mysqlhotcopy fails to copy tables".
2003-07-10 16:03:29 +02:00
ram@mysql.r18.ru
82942ebf9d
Fix for the bug #803 .
...
Now INTERVAL(NULL, N1, N2, ...) returns NULL.
2003-07-10 15:27:02 +05:00
Sinisa@sinisa.nasamreza.org
8d4e8b567a
Test case for bug #807
2003-07-09 22:33:26 +03:00
monty@mashka.mysql.fi
d495656ac5
Cleanups
2003-07-09 00:55:07 +03:00
monty@mashka.mysql.fi
d9e7072210
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-07-09 00:00:16 +03:00
monty@mashka.mysql.fi
b2cbd83913
Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS
...
Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup
2003-07-08 23:58:04 +03:00
guilhem@mysql.com
46b0e778b8
Fix for
...
BUG#797 "If query ignored on slave (replicate-ignore-table) the slave still checks if
the returned error (0) is the same as the one on the master, whereas it shouldn't
test this.
Plus a new test for BUG#797.
2003-07-08 15:50:57 +02:00
serg@serg.mylan
5929f2101d
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-07 19:08:17 +02:00
serg@serg.mylan
bbe08e4a03
finally proper recursive descent for parsing expressions with MATCH ... AGAINST in add_ft_keys()
2003-07-07 19:02:58 +02:00
guilhem@mysql.com
e386d0e126
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-07-06 18:01:39 +02:00
guilhem@mysql.com
9c73d91d54
WL#912 (more user control on relay logs):
...
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
2003-07-06 17:59:54 +02:00
Sinisa@sinisa.nasamreza.org
ee9237e0d8
missing test case for DISTINCT .. LEFT ..
2003-07-05 16:29:11 +03:00
serg@serg.mylan
38a2ed6f8b
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-04 22:06:19 +02:00
serg@serg.mylan
6a40b8e889
merge + order by (bug #515 ) temporary fix
...
properly fixed in 4.1
2003-07-04 14:42:57 +02:00
ram@mysql.r18.ru
15346c8a66
fix and test case for the bug #787 : HANDLER without INDEX doesn't work with deleted rows
2003-07-04 17:15:16 +05:00
serg@serg.mylan
40b6d07439
handler should be used with constant expressions only (or rand)
2003-07-04 12:55:25 +02:00
hf@deer.(none)
3f4f339f15
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.739
2003-07-03 23:25:54 +05:00
hf@deer.(none)
fd4a1d4e54
Fix for #739
...
check for negative count in RPAD added
2003-07-03 23:24:23 +05:00
monty@narttu.mysql.fi
741c1fd9fe
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-07-03 21:04:34 +03:00
monty@narttu.mysql.fi
a2e2099aaf
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-07-03 19:23:29 +03:00
monty@narttu.mysql.fi
be22700954
Fix for UNIXWARE 7
...
Remove unaligned warnings on Ia64 from client library when using --host
Fix for replication when using many file descriptors
2003-07-03 19:23:06 +03:00
hf@deer.(none)
dbb95326b0
Proposed fix for #751
...
Fields in key_expr (mysql_ha_read) wasn't linked to tables.
Hmm. How did it work at all?
2003-07-03 20:57:51 +05:00
hf@deer.(none)
16bf8d7aae
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0
2003-07-03 19:02:11 +05:00
hf@deer.(none)
7df3fd08c1
Test case for #570 added
2003-07-03 19:01:01 +05:00
ram@mysql.r18.ru
726fca05f7
Fix and test-case for the bug #775 : SELECT misses rows in indexed HEAP table columns.
2003-07-03 18:21:59 +05:00
hf@deer.(none)
372de23532
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.717
2003-07-03 16:54:05 +05:00
hf@deer.(none)
eb7ab936bf
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.628
2003-07-03 16:50:17 +05:00
hf@deer.(none)
95d6b7a5ea
Testcase for #628
2003-07-03 16:48:47 +05:00
monty@narttu.mysql.fi
f259f379e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-07-03 11:56:30 +03:00
monty@narttu.mysql.fi
c21728f8c8
Cleaner implementation if INSERT ... SELECT with same tables
...
Tests cleanup (put drop database first in tests)
2003-07-03 11:55:36 +03:00
hf@deer.(none)
0cdf7f39af
Proposed bugfix for #717
...
Current table is placed into read_tables set of the current join_tab->select
so get_mm_parts function thinks that current table's record is read and
tries to calculate WHERE condition with the fields of the record.
Result of these calculations is unpredictable.
Looks funny - outcome of the SELECT depends on the queries executed before.
Anyway i think we should have testcase on this part of the code.
2003-07-03 10:42:13 +05:00
guilhem@mysql.com
ace8a06323
I committed the same changeset in my tree yesterday, but broke the tree since,
...
so I commit again in a fresh tree.
Fix for bug#763 (Relay_log_space too big by 4 bytes),
plus comments and DBUG_PRINT, and we don't start replication
if --bootstrap.
2003-07-03 01:08:36 +02:00
heikki@hundin.mysql.fi
7f4fe0b0f3
innodb.result, innodb.test:
...
Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates
2003-07-03 02:08:33 +03:00
serg@serg.mylan
b5b4f44a72
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-02 23:37:24 +02:00
serg@serg.mylan
dcd13cf264
bug #504 : in "datetime op int" comparison int wasn't converted to datetime
2003-07-02 17:12:50 +02:00
Sinisa@sinisa.nasamreza.org
d2d220eabd
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-07-02 15:08:36 +03:00
Sinisa@sinisa.nasamreza.org
1df6492c7d
Fix for a problem with :
...
CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;
2003-07-02 14:57:40 +03:00
heikki@hundin.mysql.fi
0ba742ed3b
innodb.test, innodb.result:
...
Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)
2003-07-02 13:15:45 +03:00
Sinisa@sinisa.nasamreza.org
fb39821e94
Some fixes for CREATE / INSERT FROM UNIO >..
2003-07-02 01:24:05 +03:00
Sinisa@sinisa.nasamreza.org
b7644c9212
merge changes
2003-07-02 00:26:23 +03:00
Sinisa@sinisa.nasamreza.org
c1660e1a23
Lot's of clean-ups and fixes for 4.0.14.
2003-07-02 00:10:47 +03:00
monty@mashka.mysql.fi
7b34e1c39d
Updated results after merge
2003-07-01 15:38:11 +03:00
monty@mashka.mysql.fi
ca2913a07e
Merge with 3.23 tree to get latest bug fixes
2003-07-01 15:02:16 +03:00
monty@mashka.mysql.fi
9fb7e863ad
Optimized old patches
...
Don't set field to DEFAULT value when set to NULL
2003-07-01 14:38:38 +03:00
monty@mashka.mysql.fi
5dab55de73
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-07-01 13:30:55 +03:00
monty@mashka.mysql.fi
048d545a58
Code/testcase cleanups
2003-07-01 13:29:55 +03:00
monty@mashka.mysql.fi
2b0543148d
Merge bk-internal.mysql.com:/home/bk/mysql-3.23
...
into mashka.mysql.fi:/home/my/mysql-3.23
2003-07-01 13:09:24 +03:00
monty@mashka.mysql.fi
730776c452
Fixed 'Unknown error' when doing ORDER BY on reference table which
...
was used with NULL value on NOT NULL column. (Bug #479 )
2003-06-29 21:15:51 +03:00
monty@mashka.mysql.fi
81a84424ee
SET CHARACTER SET DEFAULT didn't work (Bug #462 )
2003-06-29 12:58:43 +03:00
monty@mashka.mysql.fi
863c563481
Fixed testcase after last changes
2003-06-27 06:40:24 +03:00
monty@mashka.mysql.fi
34919a03c4
Added thread variable max_seeks_for_key
...
Change optimizer to prefer key lookups before table scan
Change table scans to be done after tables with constrains on scanned table
2003-06-27 03:04:54 +03:00
serg@serg.mylan
c781673bd7
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-06-26 21:31:37 +02:00
serg@serg.mylan
8075aac74f
bug with ranges and not_null_col=can_be_null_expr fixed
2003-06-26 21:30:53 +02:00
vva@eagle.mysql.r18.ru
c4e50b8ad7
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_479_/mysql-3.23
2003-06-26 10:31:35 -04:00
hf@deer.(none)
ad5cbc0265
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.615
2003-06-26 09:01:25 +05:00
monty@mashka.mysql.fi
7655f05dc2
LEFT JOIN optimization: Change LEFT JOIN to normal join if possible
2003-06-26 05:38:19 +03:00
vva@eagle.mysql.r18.ru
5722ae6627
fixed bug with type of user variables (bug #551 )
2003-06-25 21:11:23 -04:00
hf@deer.(none)
0ede29ffd0
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.674
2003-06-25 17:16:53 +05:00
hf@deer.(none)
45b3c643be
Testcase for #674 added
2003-06-25 17:15:33 +05:00
hf@deer.(none)
044d077893
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.666
2003-06-24 17:09:44 +05:00
hf@deer.(none)
383d354c5c
Test case for bug #666
2003-06-24 17:07:43 +05:00
hf@deer.(none)
3007290f83
Another bugfix for #615
...
Looks a bit nicer than previous one
2003-06-24 10:53:21 +05:00
monty@narttu.mysql.fi
28e96d95c5
Simple code cleanup
2003-06-23 20:05:54 +03:00
monty@narttu.mysql.fi
a51ea11147
SHOW GRANTS hided real grants when grants on both column and table (Bug 654)
2003-06-23 20:03:59 +03:00
gluh@gluh.mysql.r18.ru
afe1547866
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek
2003-06-23 12:03:50 +05:00
guilhem@mysql.com
04e5a6baa9
Always send a fake Rotate event (this is roughly 70 bytes) when starting binlog_dump.
...
This way 3.23.58 slaves will always detect a 4.0.14 master (and stop)
immediately. BUG#198.
2003-06-21 18:10:59 +02:00
gluh@gluh.mysql.r18.ru
289d375f50
SCRUM
...
Task ID 894:
Backport default_week_format variable to 4.0
2003-06-19 14:02:19 +05:00
guilhem@mysql.com
4deb135b0b
Changed change_master() to use ER_MASTER_INFO (better display).
2003-06-17 23:19:38 +02:00
guilhem@mysql.com
0a0ca19940
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-17 16:36:29 +02:00
guilhem@mysql.com
ab5479e6e2
Better error reporting in mysql-test-run (don't hide the important message
...
with 'head').
Test fix (this sync_with_master was nonsense).
Now all tests pass in 4.0 in autobuild.
2003-06-17 16:35:20 +02:00
serg@serg.mylan
b387b5add9
fulltext and left join bug fixed
2003-06-16 23:05:45 +02:00
guilhem@mysql.com
3f33f17114
Fix for nightly build test failure (test update).
...
More messages.
Testcase for bug 651.
2003-06-16 15:49:54 +02:00
guilhem@mysql.com
d2ea62cd14
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-15 12:03:01 +02:00
guilhem@mysql.com
80edc81ed0
Simplified a test.
...
thd->enter_cond() and exit_cond(), so that the I/O thread accepts to stop
when it's waiting for relay log space.
Reset ignore_log_space_limit to 0 when the SQL thread terminates.
2003-06-15 12:01:51 +02:00
heikki@hundin.mysql.fi
4da7f485b7
Many files:
...
Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed
2003-06-15 01:04:28 +03:00
guilhem@mysql.com
2e8cb7c3e0
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-14 16:41:17 +02:00
hf@deer.(none)
db088dc477
test case for bug #614
2003-06-11 22:07:23 +05:00
guilhem@mysql.com
27c70dc82e
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-10 23:31:09 +02:00