Commit graph

40406 commits

Author SHA1 Message Date
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
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
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)
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)
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
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
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
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
ramil/ram@myoffice.izhnet.ru
abfd0285d2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789
2006-11-22 13:41:33 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
802f7fc366 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
2006-11-22 12:40:15 +04:00
ramil/ram@myoffice.izhnet.ru
d40abd8738 Merge mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789
2006-11-22 12:13:09 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b11dba2f0b Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
2006-11-22 12:10:18 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
711b6a63be Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 10:52:44 +04:00
ramil/ram@myoffice.izhnet.ru
38c04fb528 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
2006-11-22 10:49:24 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c6e856de10 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
2006-11-22 10:30:46 +04:00
iggy@rolltop.ignatz42.dyndns.org
1917e12506 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799
2006-11-22 01:27:44 -05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b1a423d9f6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 10:27:11 +04:00
iggy@rolltop.ignatz42.dyndns.org
e2a6759c4a Bug#19799 delimiter command not working correctly when sourcing a sql file
- Use more appropriate test case.
2006-11-22 01:27:06 -05:00
ramil/ram@myoffice.izhnet.ru
530325adec Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
2006-11-22 10:10:55 +04:00
iggy@rolltop.ignatz42.dyndns.org
ef77a83bc2 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799
2006-11-22 00:53:36 -05:00
iggy@rolltop.ignatz42.dyndns.org
26e05951ab Bug#19799 delimiter command not working correctly when sourcing a sql file
- Post Merge Fix.
2006-11-22 00:52:32 -05:00
ramil/ram@myoffice.izhnet.ru
5060fa10f8 Merge mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
2006-11-22 09:29:22 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0a415e360c Merge mysql.com:/usr/home/ram/work/bug22029/my41-bug22029
into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
2006-11-22 09:19:51 +04:00
iggy@rolltop.ignatz42.dyndns.org
dead0ccb9d Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799
2006-11-21 21:10:54 -05:00
iggy@rolltop.ignatz42.dyndns.org
bface97ecc Bug#19799 delimiter command not working correctly when sourcing a sql file
- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead 
of the intended '//'. When removing the '\n' check for and remove 
preceeding '\r' character as well.
2006-11-21 21:10:02 -05:00
msvensson@neptunus.(none)
53122d2be0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-21 21:46:00 +01:00
msvensson@neptunus.(none)
d89db5edf8 When runnig from binary dist the .sql files are found in share/ directory 2006-11-21 21:39:37 +01:00
msvensson@neptunus.(none)
7673a2d415 Update mysql_fix_privilege_tables.sql to handle upgrade from 5.0 while retaining
old upgrade behaviour.
Add test for upgrade from 5.0.30
2006-11-21 17:44:43 +01:00
msvensson@neptunus.(none)
0ed045f51d Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-21 16:54:44 +01:00
msvensson@neptunus.(none)
30088b9d23 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-21 16:51:47 +01:00
msvensson@neptunus.(none)
f25590d8b7 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-21 16:50:40 +01:00
msvensson@neptunus.(none)
fe0fc2d637 Merge 192.168.0.4:mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-21 16:42:07 +01:00
msvensson@neptunus.(none)
9594462f72 Remove unused variable 2006-11-21 16:34:10 +01:00
msvensson@neptunus.(none)
13b5e6275a Add ALTER TABLE MODIFY statements in addition to the ALTER TABLE ADD for new
columns to make sure they both exist and have the intended type
2006-11-21 16:31:44 +01:00
msvensson@neptunus.(none)
66e3c220c6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-21 15:58:05 +01:00
msvensson@neptunus.(none)
f1a63e9506 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-21 15:41:21 +01:00
msvensson@neptunus.(none)
7cf226de11 Rename system_mysql_db_fix.test to system_mysql_db_fix30020 as it tests
mysql_fix_privilege_tables.s's ability to convert the system tables as of
3.20 to current system table format
Add similar test for 4.1.23 tables - but use "mysql < mysql_fix_privilege_tables.sql"
so it can be run on any platform.
2006-11-21 15:31:11 +01:00
msvensson@neptunus.(none)
a14ae73f55 Get name for .reject and .log files from result file name 2006-11-21 15:16:12 +01:00
mats@romeo.(none)
55b666441e Merge romeo.(none):/home/bkroot/mysql-5.1
into  romeo.(none):/home/bk/memcheck-mysql-5.1
2006-11-21 14:44:20 +01:00
msvensson@neptunus.(none)
736c5b796c No need for ndb_util_thread to have two different ndb objects allocated. Use the thd_ndb one and remove the other one. 2006-11-21 13:58:26 +01:00
mats@romeo.(none)
600a6a676c BUG#24403 (valgrind complaint on uninited st_table for innodb + rbr):
Removing DBUG_DUMP printouts for valgrind builds since they trigger warnings.
Removing valgrind memory checks completely.
Removing bzero() of record when opening table that was added earlier.
2006-11-21 13:57:52 +01:00
msvensson@neptunus.(none)
dad28e635d Fix DBUG_ENTER to print the correct function name 2006-11-21 12:53:05 +01:00