pem@mysql.telia.com
08e5a7e135
Post-merge fixes.
2003-08-26 17:41:40 +02:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
bell@laptop.sanja.is.com.ua
811ed77e5f
quick fix for found row counter
...
code cleunup
2003-08-20 21:57:37 +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
bell@laptop.sanja.is.com.ua
dd9cbce47b
merge
2003-08-19 20:14:35 +03:00
monty@mashka.mysql.fi
10c4acfb4f
merge
2003-08-19 00:10:21 +03:00
bell@laptop.sanja.is.com.ua
85f397781b
Code cleanup
2003-08-16 13:26:48 +03:00
bell@sanja.is.com.ua
b6a8d68ae4
fixed problem with reference on derived table fields (BUG#1031)
2003-08-12 15:04:49 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
ram@mysql.r18.ru
0f47087e22
Fix for the bug #841 : wrong number of warnings
2003-07-14 15:32:31 +05: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
guilhem@mysql.com
fbebac9a48
Fix for BUG#791:
...
a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details.
2003-07-11 14:26:44 +02:00
pem@mysql.telia.com
a8a29a39d2
Merging 4.1 into 5.0 (second pass; post-merge fixes).
...
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(
2003-07-09 17:07:12 +02:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
hf@deer.(none)
faa2b41114
Bug #570 fixed
2003-06-19 22:06:51 +05:00
monty@narttu.mysql.fi
40109c574a
Merge with 4.0.13
2003-06-04 19:21:51 +03:00
monty@mashka.mysql.fi
e436736d29
ixed wrong unlock of tables (new bug)
2003-05-26 20:48:40 +03:00
heikki@hundin.mysql.fi
b8e5b65f88
ha_innodb.cc:
...
Remove accidenatlly committed debug printfs when query cache is used
sql_update.cc, sql_load.cc, sql_insert.cc, sql_delete.cc:
For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
2003-05-26 19:10:43 +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
cb7061ebe4
merge
2003-05-22 02:57:27 +03:00
monty@mashka.mysql.fi
6aa8929cf3
After merge fixes
...
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
venu@myvenu.com
39cbb547d4
Resolve merge colflict
2003-05-21 00:12:09 -07:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
41d2103e26
Fixed 'Unknown error' when using 'UPDATE ... LIMIT'. Bug 373
2003-05-13 20:07:43 +03:00
monty@narttu.mysql.fi
13530887cb
Fix for UNION and LEFT JOIN (Bug #386 )
...
Fixed wrong logging of Access denied error (Bug #398 )
2003-05-13 18:58:26 +03:00
vva@eagle.mysql.r18.ru
afd581edd3
made lex a pointer in THD
2003-05-05 14:54:37 -04:00
monty@narttu.mysql.fi
5f028be2e6
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-05-03 16:22:56 +03:00
monty@narttu.mysql.fi
7410b6cbdf
Fix problem where key_read was not cleaned up properly, which caused assert in innodb test.
2003-05-03 16:21:43 +03:00
serg@serg.mylan
784fb81426
INSERT ... UPDATE ... VALUES()
2003-05-03 01:16:56 +02:00
venu@myvenu.com
eb137c063c
Support of warnings for all DML statements (Insert, Update and Alter)
...
Fix LOAD DATA INFILE warnings to have a better meanigful messages
Fix to make the mysql command line to automatically show the warnings count for all basic commands
2003-04-30 00:02:28 -07:00
pem@mysql.com
35c82164f6
Merged 4.1 to 5.0.
2003-04-29 12:06:04 +02:00
Sinisa@sinisa.nasamreza.org
5d3df7610f
merge fix
2003-04-26 16:44:42 +03:00
igor@hundin.mysql.fi
80615fade2
Many files:
...
Added the MAX_LENGTH_FOR_SORT_DATA option
filesort.cc:
Added the MAX_LENGTH_FOR_SORT_DATA option
2003-04-24 14:33:33 +03:00
monty@narttu.mysql.fi
f6a43bd567
Fixes for valgrind
...
Added optimzation for clustered index
Fixed bug in UPDATE ... ORDER BY
Fixed handling of UPDATE ... LIMIT
2003-04-23 21:52:16 +03:00
Sinisa@sinisa.nasamreza.org
d91d6d5e2e
Three bug fixes and one fix being undone.
2003-04-19 23:18:35 +03:00
pem@mysql.com
64da2fff67
Post post-merge fix.
2003-04-17 00:34:15 +02:00
pem@mysql.com
386b0b91b2
Merged 4.1 into 5.0.
2003-04-16 23:23:23 +02:00
Sinisa@sinisa.nasamreza.org
c3db30b5f1
Two bug fixes
2003-04-11 20:09:24 +03:00
hf@deer.mysql.r18.ru
5d4e9f95f2
Merging
2003-04-08 19:43:24 +05:00
hf@deer.mysql.r18.ru
0428d08606
SCRUM
...
two KILL versions
code trimming with headquarter's suggestions
2003-04-08 19:18:33 +05:00
bell@sanja.is.com.ua
7bd0d02bda
fixed st_select_lex initialization
...
fixed mustiupdate subselect compatibility
(bug 217)
2003-04-05 09:29:28 +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
654410a3d3
Deprecated the update log (Sprint task #792 ). Now --log-update
...
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments).
2003-04-02 00:15:20 +02:00
hf@genie.(none)
0ee0589e93
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into genie.(none):/home/hf/work/mysql-5.0.kil
2003-03-31 13:42:37 +05:00
hf@genie.(none)
f8f0b70380
SCRUM
...
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05:00
serg@serg.mysql.com
ce016df883
another bad merge fixed
2003-03-20 12:09:20 +01:00
monty@narttu.mysql.fi
b883a9c01c
Merge with 4.0.12
2003-03-19 22:25:44 +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
monty@narttu.mysql.fi
a434bca704
Merge with 4.0
2003-03-16 19:17:54 +02:00
monty@mashka.mysql.fi
b879a40120
Write binlog before commit when doing INSERT ... SELECT
2003-03-16 16:28:30 +02:00
