jonas@eel.(none)
6371e9a23f
ndb
...
remove grep stuff
2005-08-19 13:20:36 +02:00
heikki@hundin.mysql.fi
d9bbf7bc53
btr0sea.c:
...
Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL
2005-08-19 12:54:13 +03:00
igor@rurik.mysql.com
2d32b77693
distinct.test, distinct.result:
...
Added test cases for bug #12625 .
sql_select.cc:
Fixed bug #12625 .
Fixed invalid removal of constant items from the DISTINCT
list in the function create_distinct_group.
2005-08-19 01:57:22 -07:00
jonas@eel.(none)
c962896744
Merge eel.(none):/home/jonas/src/mysql-5.0-push
...
into eel.(none):/home/jonas/tmp/kkk/mysql-5.0
2005-08-19 10:50:51 +02:00
bell@sanja.is.com.ua
20a052880f
fixed test after merge
2005-08-19 11:38:14 +03:00
bell@sanja.is.com.ua
102420642a
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
2005-08-19 11:37:00 +03:00
heikki@hundin.mysql.fi
6b32f5a1e9
row0sel.c:
...
Temporarily remove error print if MySQL tries to do a SELECT even though trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of cursors is properly implemented (Bug #12456 )
2005-08-19 11:33:11 +03:00
jonas@eel.(none)
b0cee8bf08
Merge eel.(none):/home/jonas/src/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-19 10:25:28 +02:00
jonas@eel.(none)
e449bfed9d
jonas:
...
fix bk checkout properties
2005-08-19 10:24:37 +02:00
jonas@eel.(none)
3aede000a2
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-19 10:13:35 +02:00
jonas@eel.(none)
bf835c89c2
ndb -
...
remove grep from Makefile
2005-08-19 10:12:44 +02:00
bell@sanja.is.com.ua
376c5307df
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
2005-08-19 10:40:46 +03:00
andrey@lmy004.
a5ecf5f4b1
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-clean
2005-08-19 09:14:59 +02:00
andrey@lmy004.
7f9e97f70c
test fix for fix of 12591
2005-08-19 09:08:41 +02:00
jonas@eel.(none)
24be1c1524
jonas -
...
Fix checkout properties
2005-08-19 09:04:30 +02:00
bell@sanja.is.com.ua
69476be2d1
changes in row operation
2005-08-19 09:46:59 +03:00
jonas@eel.(none)
178a76fab4
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-19 07:58:54 +02:00
bell@sanja.is.com.ua
a3724d2546
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
2005-08-19 08:55:38 +03:00
jonas@eel.(none)
1b1d1d8d5c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-19 07:52:42 +02:00
jonas@eel.(none)
290cfe313c
Merge eel.(none):/home/jonas/src/mysql-4.1-push
...
into eel.(none):/home/jonas/src/mysql-4.1
2005-08-19 07:51:47 +02:00
patg@radha.local
d0767dfad3
BUG #12498 Fixed mispelling
2005-08-19 07:51:22 +02:00
jonas@eel.(none)
523039c832
ndb
...
rename config.cpp -> ndb_config.cpp for case insesitive filesystems
why wasn't this done in 4.1 directly
2005-08-19 07:48:59 +02:00
jan@hundin.mysql.fi
eb559bd0c5
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-08-19 05:08:49 +03:00
igor@rurik.mysql.com
6fae8f6c8d
Manual merge
2005-08-18 15:18:26 -07:00
igor@rurik.mysql.com
743917759c
Manual merge
2005-08-18 15:17:04 -07:00
andrey@lmy004.
0e6606c8da
Merge lmy004.:/work/mysql-5.0-clean
...
into lmy004.:/work/mysql-5.0-bug12591
2005-08-18 23:40:04 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
7c99cf1af0
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-18 21:49:46 +03:00
evgen@moonbone.local
1fc33b0533
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/10624-bug-5.0-mysql
2005-08-18 22:46:17 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
c6ee26ab45
Some minor fixes for Netware. These were required after we started building
...
against a later version of libc.
2005-08-18 21:26:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3bfa514655
Changes for Netware. This is needed when building against newer Libc
...
than we've used before.
2005-08-18 21:22:35 +03:00
dlenev@mysql.com
6c39364f85
Fix for bug #11896 "Partial locking in case of recursive trigger definitions".
...
If we are in stored function or trigger we should ensure that we won't change
table that is already used by calling statement (this can damage table or
easily cause infinite loops). Particularly this means that recursive triggers
should be disallowed.
2005-08-18 19:07:23 +04:00
jimw@mysql.com
6c3dafd07c
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-18 07:59:43 -07:00
stewart@mysql.com
78bd379b29
Fix merge of BUG10950 and jonas' message improvements.
2005-08-19 00:48:03 +10:00
stewart@mysql.com
b17e14c5ff
merge fix
2005-08-19 00:39:56 +10:00
igor@rurik.mysql.com
c93d841dbf
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-18 07:30:45 -07:00
sergefp@mysql.com
8761dd329c
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-aug18-fix
2005-08-18 18:28:02 +04:00
sergefp@mysql.com
c085c9a3b7
Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08-16 00:03:50+04:00, aivanov@mysql.com
...
)
2005-08-18 18:26:30 +04:00
igor@rurik.mysql.com
391416898f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-18 07:25:56 -07:00
stewart@mysql.com
fe1b8cbfb8
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-08-19 00:14:43 +10:00
stewart@mysql.com
10639bbdff
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-08-19 00:04:45 +10:00
igor@rurik.mysql.com
b5e7bfa9f2
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-18 05:36:22 -07:00
jonas@eel.(none)
7c70be87b7
Merge eel.(none):/home/jonas/src/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-18 14:28:13 +02:00
jonas@eel.(none)
6399a93ac2
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-5.0
2005-08-18 14:25:00 +02:00
jonas@eel.(none)
96f719818c
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-18 14:07:31 +02:00
jonas@eel.(none)
3b68047235
bug#12118 - ndb alter table data loss
...
Split table version into 2 (major, minor)
Impl. signaling to API when table has been altered
Allow running transactions to use any minor number for transactions
2005-08-18 14:02:25 +02:00
petr@mysql.com
cb71626268
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usersnfs/pchardin/mysql-5.0
2005-08-18 11:25:32 +02:00
petr@mysql.com
4fb6f4dddf
Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory
...
and Bug#12297 SP crashes the server if data inserted inside a lon loop
Third commit attempt. With fixes to the issues, showed up after full rebuild and
tests on other hosts.
2005-08-18 11:23:54 +02:00
bell@sanja.is.com.ua
fc070c2bcb
stop on NULL comparison only if it is allowed (BUG#12509)
2005-08-18 12:07:14 +03:00
timour@mysql.com
76cacf4522
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-18 11:29:29 +03:00
timour@mysql.com
f31f5eabc7
WL#2486 - natural and using join
...
Fixed debug printout.
2005-08-18 11:28:50 +03:00