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
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@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@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@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
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
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@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
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)
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
msvensson@shellback.(none)
a9eb1b709a
Add missing semicolon
2006-11-21 09:36:29 +01:00
msvensson@shellback.(none)
611540db32
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-21 00:51:34 +01:00
msvensson@shellback.(none)
fc144204da
Port mysql_upgrade to be tested on windows
2006-11-21 00:46:13 +01:00
msvensson@shellback.(none)
4dc0aeb7b6
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-20 23:38:22 +01:00
msvensson@shellback.(none)
147eaa3c13
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-20 21:53:17 +01:00
cmiller@zippy.cornsilk.net
b24d39c9e7
Change collation for ALTER-omitted ENUMs from utf8_bin (where "y" and
...
"Y" are different) to utf8_general_ci (where same).
2006-11-20 15:37:22 -05:00
msvensson@shellback.(none)
3b57cf0f74
Fix mysqltest to automatically replace \ with / also in
...
$MYSQLTEST_VARDIR, for usage of vardir=e:/var<nnn> on windows
2006-11-20 21:03:40 +01:00
msvensson@neptunus.(none)
52cafbccb0
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-17 14:47:14 +01:00
msvensson@neptunus.(none)
4eb86ec2cc
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-17 13:41:18 +01:00
msvensson@neptunus.(none)
f0d89307a8
Remove unused variables/options that does not have any effect
...
Update usage description
2006-11-17 13:36:10 +01:00
msvensson@neptunus.(none)
d98ffb2ccf
Cleanup --extern implementation, remove some unused variables and check arguments
2006-11-17 13:30:42 +01:00
msvensson@neptunus.(none)
3f2c3f04bf
BUG#24354 option "--extern" of mysql-test-run.pl does not work anymore
2006-11-17 13:20:48 +01:00
msvensson@neptunus.(none)
770a4f7c68
BUG#24274 option "--big-test" of mysql-test-run.pl does not work anymore
2006-11-17 13:14:07 +01:00
msvensson@neptunus.(none)
b3a5d6196f
remove junk comment
2006-11-17 13:10:54 +01:00
msvensson@neptunus.(none)
91af3edd03
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-17 12:47:16 +01:00
msvensson@neptunus.(none)
dc495b8c4f
Merge 192.168.0.4:mysql/bug22958/my50-bug22958
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-17 12:38:52 +01:00
msvensson@neptunus.(none)
dbdd10752c
Bug#24274 option "--big-test" of mysql-test-run.pl does not work anymore
...
- Set environment variable BIG_TEST when using --big-test
- Skip comment lines when looking for features a test case supports.
2006-11-17 11:01:09 +01:00
msvensson@neptunus.(none)
d032660b5f
Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore
...
- Dont require restart when using extern and there is no record of
master being started(pid is not known)
2006-11-17 10:46:21 +01:00
hartmut@walhalla.site
f4e097420a
This command is not portable, as POSIX does not require it; use . instead.
...
(Bug #24294 )
2006-11-16 23:39:02 +01:00
andrey@example.com
8b947e265b
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug24219/my50
2006-11-16 16:37:07 +01:00
andrey@example.com
2e13117808
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into example.com:/work/bug24219/my41
2006-11-16 16:29:06 +01:00
msvensson@neptunus.(none)
dd773b1a98
Add the two new functions to udf_example.def so they will be exported by dll's
2006-11-16 16:19:29 +01:00
msvensson@neptunus.(none)
4ea853e072
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-16 15:54:50 +01:00
msvensson@neptunus.(none)
81c81296df
Put more spcific paths at the top of list to search for binaries
2006-11-16 15:23:13 +01:00
msvensson@neptunus.(none)
7e3a654785
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-16 15:11:12 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f701fc54fc
after-merge fixup.
...
- have to explicitly set null_value.
2006-11-16 18:09:34 +04:00
andrey@example.com
5bf475376e
Fix for bug#24219 ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crash
...
(this is the 5.0 patch, because 4.1 differs)
There was an improper order of doing chained operations.
To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other
ALTER TABLE clause, leads to server crash independent of the presence of
indices and data in the table.
2006-11-16 14:01:51 +01:00
andrey@example.com
e5035f9020
Merge example.com:/work/bug24219/my41
...
into example.com:/work/bug24219/my50
2006-11-16 13:46:43 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
13546313da
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug23653/my41-bug23653
2006-11-16 16:19:10 +04:00
andrey@example.com
de904f54bf
Fix for bug#24219 ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crash
...
There was an improper order of doing chained operations.
To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other
ALTER TABLE clause, leads to server crash independent of the presence of
indices and data in the table.
2006-11-16 13:18:37 +01:00