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)
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)
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
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
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)
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)
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)
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@neptunus.(none)
8809a5e27e
mysql_client_test not found when running from binary dist
...
Look in bin for myql_client_test executable
2006-11-20 13:02:49 +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)
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
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)
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
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
ramil/ram@mysql.com/myoffice.izhnet.ru
1bd5c0d51d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
2006-11-16 16:17:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b4dd41de69
Merge mysql.com:/usr/home/ram/work/bug23653/my41-bug23653
...
into mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
2006-11-16 15:26:33 +04:00
cmiller@zippy.cornsilk.net
11b5d3fabc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my50-bug19955
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-15 12:27:09 -05:00
cmiller@zippy.cornsilk.net
5d4c57b900
Bug#19955: unsigned bigint used as signed with MOD function
...
Problem: When we have a really large number (between 2^63 and 2^64)
as the left side of the mod operator, it gets improperly corerced
into a signed value.
Solution: Added check to see if the "negative" number is really
positive, and if so, cast it.
2006-11-15 12:23:07 -05:00
andrey@example.com
bddd935bb0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug23760/my50
2006-11-15 11:50:30 +01:00
msvensson@neptunus.(none)
15c3ed7517
Cleanup after test cases
2006-11-15 10:23:27 +01:00
andrey@example.com
d1e5cfd66f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug23760/my50
2006-11-14 20:48:48 +01:00
msvensson@neptunus.(none)
a0f00ce965
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-14 19:47:36 +01:00
msvensson@neptunus.(none)
c674b88bfc
Update test cases after run with --check-testcases
2006-11-14 19:45:52 +01:00
andrey@example.com
9299fd6715
Fix for bug#23760 ROW_COUNT() and store procedure not owrking together
...
The problem was that THD::row_count_func was zeroed too. It was zeroed
as a fix for bug 4905 "Stored procedure doesn't clear for "Rows affected"
However, the proper solution is not to zero, because THD::row_count_func has
been set to -1 already in mysql_execute_command(), a later fix, which obsoletes
the incorrect fix of #4095
2006-11-14 18:40:11 +01:00
kaa@polly.local
fb30aeaa81
Merge polly.local:/tmp/maint/bug22129/my50-bug22129
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-11-14 16:38:11 +03:00
kaa@polly.local
25e75e7074
Merge polly.local:/tmp/maint/bug22129/my41-bug22129
...
into polly.local:/home/kaa/src/maint/mysql-4.1-maint
2006-11-14 16:36:31 +03:00
df@kahlann.erinye.com
cc129e6256
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-14 14:29:58 +01:00