ramil/ram@myoffice.izhnet.ru
9d86d7e97b
Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
...
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-18 15:59:40 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c57442d6d8
after merge fix.
2007-01-18 15:28:45 +04:00
ramil/ram@myoffice.izhnet.ru
a2303ea3fe
Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
...
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-18 11:13:13 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5c42e68388
after merge fix.
2007-01-18 10:51:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
e8968822dc
Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
...
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-18 09:39:47 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0b5696b82b
Fix for bug #22533 : Traditional: Too-long bit value not rejected.
...
Problem: storing >=8 byte hexadecimal values we don't check data.
Fix: check if the data fits the {u}longlong range.
2006-12-06 16:32:12 +04:00
tsmith/tim@siva.hindu.god
2a0e2d1d38
rpl_init_slave.result:
...
Update test result due to fix for bug 23883.
2006-11-28 16:39:04 -07:00
cmiller@zippy.cornsilk.net
80f695e3e6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-28 13:12:47 -05:00
cmiller@zippy.cornsilk.net
45ea756c5f
Revert charset breakage.
2006-11-28 13:08:41 -05:00
ramil/ram@myoffice.izhnet.ru
2469ca2144
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug21587/my51-bug21587
2006-11-28 13:54:55 +04:00
ramil/ram@myoffice.izhnet.ru
25b5024571
Merge mysql.com:/usr/home/ram/work/bug21587/my50-bug21587
...
into mysql.com:/usr/home/ram/work/bug21587/my51-bug21587
2006-11-28 13:49:43 +04:00
tsmith/tim@siva.hindu.god
37d1d86d9f
raise max_connections default to avoid conflicts with apache max_childs settings (Bug #23883 )
2006-11-27 15:01:14 -07:00
jpipes@shakedown.(none)
03a5dcd7ce
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
2006-11-27 14:58:57 -05:00
jpipes@shakedown.(none)
7c7b1ede76
Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
...
into shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
2006-11-27 14:46:48 -05:00
msvensson@neptunus.(none)
e09616e1ac
Add my_getpagesize.c as source for mysys
2006-11-27 16:04:52 +01:00
msvensson@neptunus.(none)
545fac620f
Add mysys/my_getpagesize as source file foir mysql_upgrade
...
Don't link mysql_upgrade with mysys
2006-11-27 15:00:08 +01:00
msvensson@neptunus.(none)
a45b64b134
Move misplaced #endif
2006-11-27 14:02:14 +01:00
msvensson@neptunus.(none)
a6ce7b89a9
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-27 10:48:41 +01:00
msvensson@neptunus.(none)
1bd6e4f66a
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-27 10:39:40 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
55aa6e04bd
Fix for bug #21587 : FLUSH TABLES causes server crash when used with HANDLER statements
...
Problems (appear only under some circumstances):
1. we get a reference to a deleted table searching in the
thd->handler_tables_hash in the mysql_ha_read().
2. DBUG_ASSERT(table->file->inited == handler::NONE); assert fails in the
close_thread_table().
Fix: end open index scans and table scans and remove references to the
tables from the handler tables hash. After this preparation it is safe
to close the tables. The close can no longer fail on open index/table
scans and the closed table will not be used again by handler functions.
2006-11-27 13:24:24 +04:00
kaa@polly.local
332afaa7b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-11-24 23:45:31 +03:00
kaa@polly.local
699898c82c
Merge polly.local:/tmp/maint/bug22077/my50-bug22077
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-11-24 17:01:43 +03:00
kaa@polly.local
9ff59261bd
Merge polly.local:/tmp/maint/bug22077/my50-bug22077
...
into polly.local:/tmp/maint/bug22077/my51-bug22077
2006-11-24 16:23:40 +03:00
knielsen@ymer.(none)
c6986359f9
Merge ymer.(none):/usr/local/mysql/tmp/mysql-5.0-maint
...
into ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
2006-11-24 12:42:56 +01:00
knielsen@ymer.(none)
f007ff64e0
Merge ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
...
into ymer.(none):/usr/local/mysql/tmp/mysql-5.1-new-maint
2006-11-24 12:40:23 +01:00
knielsen@ymer.(none)
eb9dfafa65
Merge ymer.(none):/usr/local/mysql/tmp/mysql-4.1-maint
...
into ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca
2006-11-24 12:39:16 +01:00
knielsen@ymer.(none)
d4595f3c57
Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
...
traces in Valgrind (broken libc6-dbg).
Installing libc6-dbg on Debian will still provide proper bactraces, even
without setting LD_LIBRARY_PATH explicitly.
2006-11-24 12:38:39 +01:00
msvensson@neptunus.(none)
d4d675a6e2
mysql_fix_priviileg_tables.sql might be in share/ but not in $path_share
...
since that is where the lang files etc are
2006-11-23 21:12:50 +01:00
msvensson@neptunus.(none)
c4af2f26a7
Add mysys/my_getpagesize.c as source file for mysql_upgrade
2006-11-23 21:07:41 +01:00
msvensson@neptunus.(none)
91c3698aba
Convert one more opt_source_dist
2006-11-23 20:08:48 +01:00
msvensson@neptunus.(none)
c99678df03
Fix netware compile failure
...
Remove other warnings about unused variables
2006-11-23 20:07:53 +01:00
msvensson@neptunus.(none)
0e4d97edf0
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-23 18:38:27 +01:00
msvensson@neptunus.(none)
58a8b34e20
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-23 18:28:16 +01:00
msvensson@neptunus.(none)
54649b06a3
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-23 18:23:35 +01:00
msvensson@neptunus.(none)
8c2efdf4bd
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 18:19:54 +01:00
msvensson@neptunus.(none)
cdbc79b500
Make source_dist a "local" global variable
...
And it's not an "opt"
2006-11-23 17:30:32 +01:00
msvensson@neptunus.(none)
8f85eaf925
Remove duplicate "$report_features"
2006-11-23 17:26:06 +01:00
msvensson@neptunus.(none)
7053ef84bf
Rework my_getpagesize function
...
- Put 'my_getpagesize' in it's own .c file
- Map the call 'my_getpagesize' directly to 'getpagesize' if it exists
- Add default implementation for 'my_getpagesize' to be used if no platform
specfic function exists
2006-11-23 17:23:29 +01:00
mats@romeo.(none)
333f794adc
BUG#24488 (Valgrind warnings on invalid read in mysql_client_binlog_statement):
...
Disabling debug printouts for valgrind builds that print unallocated memory.
2006-11-23 16:21:53 +01:00
msvensson@neptunus.(none)
c76adf6021
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
176313a679
mysql_upgrade should look for .sql script also in share/ directory
2006-11-23 11:56:05 +01:00
msvensson@neptunus.(none)
d3b4712bad
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 11:54:25 +01:00
msvensson@neptunus.(none)
2aa0d085e3
Build fixes for NetWare
2006-11-23 11:38:44 +01:00
mats@romeo.(none)
6b57021683
BUG#24533 (uninitialized null bits in m_after_image):
...
Removing valgrind memory checks from code.
2006-11-23 10:43:43 +01:00
mats@romeo.(none)
f827f734c8
BUG#24533 (uninitialized null but of m_after_image):
...
Patch to fix valgrind warning that uninitialized bytes were written.
The warning was caused by set_default(), which assumes that the field pointer is pointing
into record[0], while all other functions honors the move_field_offset().
2006-11-23 10:15:02 +01:00
msvensson@neptunus.(none)
8e6cf24d3b
Fix my_system_gmt_sec function declaration to be same as definition
2006-11-23 09:56:50 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d6f06d4245
after-merge fix-up.
2006-11-22 17:59:46 +04:00
andrey@example.com
2a148b400d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug24396/my51
2006-11-22 14:11:11 +01:00
andrey@example.com
35238085d6
fix for bug#24396
2006-11-22 14:06:59 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
8512b7e5bd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
2006-11-22 14:06:37 +04:00