bell@sanja.is.com.ua
8187b23043
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-15 23:53:28 +02:00
hf@deer.(none)
ac9de85b0f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-03-16 01:53:27 +04:00
hf@deer.(none)
f2ef7e1a32
Yet another fix for spatial parts
2004-03-16 01:50:35 +04:00
serg@serg.mylan
3351b01d83
cleanup
2004-03-15 22:02:47 +01:00
bell@sanja.is.com.ua
6eb403cfdc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-15 22:17:31 +02:00
bell@sanja.is.com.ua
b4bb6b7f77
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-15 21:53:25 +02:00
konstantin@mysql.com
36120d420a
Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc
...
exceed unsigned long limit.
2004-03-15 22:39:36 +03:00
vva@eagle.mysql.r18.ru
189761bcd3
actions for bug
...
#2709 Affected Rows for ON DUPL. KEY undocumented, perheps illogical
1. added COPY_INFO::updated to work with it in
'insert .. on duplicate' instead of COPY_INFO::deleted
2. added affected rows to output of "info:" in mysqltest.c
2004-03-15 21:36:16 +04:00
konstantin@mysql.com
e43ac76094
Fixes for bugs #2274 "mysqld gets SIGSEGV during processing of malformed
...
COM_EXECUTE packet" and #2795 "prepare + execute without bind_param crashes
server" and #2473 "seg fault running tests/client_test.c":
- length checking added to packet parser
- default impelemntation of Item_param::set_param_func will work in
case of malformed packet.
No test cases are possible in our test suite, as there are no tests
operating on protocol layer.
2004-03-15 20:20:47 +03:00
bell@sanja.is.com.ua
6fc3d9ba81
merge
2004-03-15 17:01:30 +02:00
bell@sanja.is.com.ua
3e1c841ced
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
2004-03-15 16:31:41 +02:00
gluh@gluh.mysql.r18.ru
df0ede69fc
Task #835 : additional changes fot str_to_date
2004-03-15 18:28:21 +04:00
bell@sanja.is.com.ua
56a9b11872
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2004-03-15 15:39:28 +02:00
bell@sanja.is.com.ua
bffd015308
after review fixes
2004-03-15 15:38:53 +02:00
hf@deer.(none)
54167da4b0
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.valg
2004-03-15 16:57:56 +04:00
hf@deer.(none)
317e89bc49
Fix for valgrind's warning
2004-03-15 16:32:53 +04:00
monty@mysql.com
9e8938cbae
merge & simple cleanup
2004-03-15 13:21:14 +02:00
bell@sanja.is.com.ua
d2265b6345
merge
2004-03-15 13:16:40 +02:00
monty@mysql.com
cf66e187e2
Optimizations
2004-03-15 12:53:27 +02:00
bell@sanja.is.com.ua
443870e95e
fixed comments
2004-03-15 11:02:54 +02:00
miguel@hegel.local
a81d480d78
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hegel.local:/home/miguel/bk/mysql-4.1
2004-03-14 16:44:23 -03:00
serg@serg.mylan
42c19ada56
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-14 11:51:09 +01:00
serg@serg.mylan
ae279eae3b
UUID() bug that manifests itself on low-res (<1 us) timers only
...
(and not critical at all as it does not result in repeated values)
2004-03-14 11:50:15 +01:00
vva@eagle.mysql.r18.ru
283d455711
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_856/mysql-4.1
2004-03-14 01:33:16 +04:00
vva@eagle.mysql.r18.ru
b3cb4dace5
fixed bug #856 'Naming a key "Primary" causes trouble'
2004-03-14 01:31:30 +04:00
vva@eagle.mysql.r18.ru
5bada5ee99
fixed bug #1427 "enum allows duplicate values in the list"
2004-03-13 23:13:31 +04:00
miguel@hegel.local
0c92e90441
Cast for VC++ compiler errors
2004-03-12 18:05:51 -03:00
monty@mysql.com
e9e9ce659e
Fixes to newly pushed code
2004-03-12 15:56:28 +02:00
vva@eagle.mysql.r18.ru
158770e356
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0
2004-03-12 17:56:27 +04:00
vva@eagle.mysql.r18.ru
131fd37cef
extra correction of check_db_name, check_table_name and check_column_name
2004-03-12 17:55:33 +04:00
hf@deer.(none)
f2366bf02c
Spatial code changed to get rid of inconsistent this->* operation
...
Now we use virtual calls instead and redirect VMT pointer of the
geometry object with 'new' operation
2004-03-12 12:04:00 +04:00
monty@mysql.com
91a8546112
Portability fixes & fixing of test suite
2004-03-12 09:15:08 +02:00
monty@mysql.com
012ce71c7f
Merge
2004-03-12 01:13:04 +02:00
monty@mysql.com
98fb8ea4c7
Merge with 3.23 to get patch for floor()
2004-03-12 01:12:14 +02:00
monty@mysql.com
e27960a44e
Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts
...
Abort if we can't allocate memory for table cache
Fix bug with multi-update-tables and BDB tables.
2004-03-12 01:10:22 +02:00
Sinisa@sinisa.nasamreza.org
37817f60cc
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-11 22:27:17 +02:00
Sinisa@sinisa.nasamreza.org
a86753b00e
multi_update.result:
...
Test case for a #2996 bug fix
multi_update.test:
test case for a #2996 bug fix
sql_select.cc:
Fix for a bug #2996 involving multi-table updates over the const tables
2004-03-11 22:26:03 +02:00
guilhem@mysql.com
69517b22a1
Fix for BUG#2983 "If statement was killed on master, slave errors despite replicate-wild-ignore-t"
...
We introduce a new function mysql_test_parse_for_slave().
If the slave sees that the query got a really bad error on master
(killed e.g.), then it calls this function to know if this query
can be ignored because of replicate-*-table rules (do not worry
about replicate-*-db rules: they are checked so early that they have
no bug). If the answer is yes, it skips the query and continues. If
it's no, then it stops and say "fix your slave data manually" (like it
did before this change).
2004-03-11 17:38:19 +01:00
guilhem@mysql.com
b36b25673e
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-11 16:24:47 +01:00
guilhem@mysql.com
cf287341cc
Fix for BUG#2921 "Replication problem on mutex lock in mySQL-4.0.18":
...
re-using unused LOCK_active_mi to serialize all administrative
commands related to replication:
START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave()
(replication autostart at server startup), end_slave() (replication
autostop at server shutdown), LOAD DATA FROM MASTER.
This protects us against a handful of deadlocks (like BUG#2921
when two START SLAVE, but when two STOP SLAVE too).
Removing unused variables.
2004-03-11 16:23:35 +01:00
ram@gw.mysql.r18.ru
0aab3a9eba
a fix (bug #2885 : like datetime)
2004-03-11 18:21:57 +04:00
jani@ua72d24.elisa.omakaista.fi
3b5a46939f
Small fixes.
2004-03-11 15:41:07 +02:00
guilhem@mysql.com
1c0d5ad25c
Backporting parts of
...
ChangeSet 1.1620.12.1 and ChangeSet 1.1625.2.1
from 4.1. This makes the slave I/O thread flush the relay log
after every event, which provides additional safety in case
of brutal crash (reduces chances to lose a part of the relay log).
2004-03-10 16:56:28 +01:00
guilhem@mysql.com
30541b324c
Undoing 2 parts of changeset 1.1730.1.1 :
...
- the one about BUG#2921
- the one about relay log flushing
Both will be rewritten in a next changeset
(this one will not be pushed before the next changeset).
2004-03-10 16:30:47 +01:00
monty@mysql.com
7738d08294
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-03-10 13:48:41 +02:00
monty@mysql.com
4ee44751d9
Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882 )
2004-03-10 13:46:11 +02:00
ram@gw.mysql.r18.ru
cd7ec53dad
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3036
2004-03-10 13:36:20 +04:00
jani@ua72d24.elisa.omakaista.fi
8dcb41d8d9
Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULL
...
is false.
2004-03-09 22:03:01 +02:00
ram@gw.mysql.r18.ru
8ffd9a9190
Fix for the bug #3089 : SUBSTRING bug when mixed with CONCAT and ORDER BY
2004-03-09 16:52:37 +04:00
bell@sanja.is.com.ua
d3b96b3a6e
after merge fix
2004-03-09 14:44:15 +02:00