Commit graph

33527 commits

Author SHA1 Message Date
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
kaa@polly.local
346033a5da Fix for bug #22077 "DROP TEMPORARY TABLE fails with wrong error if read_only is set"
Do not issue a 'read-only' error in case of DROP TEMPORARY TABLE on a non-existing temporary table.
Instead produce the correct "Unknown table" error or warning (in cases when the IF EXISTS clause was specified).

To a documentor: the part of the manual describing the 'read_only' system variable should be clarified to state the following:
"When the read_only variable is set to ON, all operations which create/update/drop tables are rejected with the exceptions for:
1. Any operation performed by the replication thread on a slave server
2. Any operation performed by a user that have the SUPER privilege
3. Any operation that creates/updates/drops only temporary tables"
2006-11-20 17:35:23 +03: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)
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
joerg@trift2.
818f3fa21f Merge trift2.:/MySQL/M41/bug22081-4.1
into  trift2.:/MySQL/M50/bug22081-5.0
2006-11-16 14:38:15 +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
joerg@trift2.
29dd8d2e58 support-files/mysql.spec.sh : Add an "Obsoletes" note relative to SuSE RPMs (bug#22081). 2006-11-16 14:01:31 +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
joerg@trift2.
66142e76c5 Merge trift2.:/MySQL/M50/spec-mtr-5.0
into  trift2.:/MySQL/M50/clone-5.0
2006-11-15 20:39:04 +01:00
joerg@trift2.
844d5161fc Merge trift2.:/MySQL/M41/spec-mtr-4.1
into  trift2.:/MySQL/M50/spec-mtr-5.0
2006-11-15 20:34:44 +01:00
joerg@trift2.
65d6b24ed9 support-files/mysql.spec.sh : Use "report features" in the first test run. 2006-11-15 20:27:02 +01: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
cmiller@zippy.cornsilk.net
a70b94281c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-15 10:03:54 -05:00
cmiller@zippy.cornsilk.net
07ff53ea2f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-15 10:01:50 -05:00
cmiller@zippy.cornsilk.net
2b3a69eb42 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700
2006-11-15 09:55:24 -05:00
cmiller@zippy.cornsilk.net
3ebd031e00 Bug#17700: mysql_fix_privilege_tables cannot handle a password \
with embedded spaces
  
Problem:  Original code written assuming password contains no spaces.
Further, because of how sh interprets characters in variables, you
cannot do the "simple solution".
  
Solution:  Move the "was a password provided" check to the end. This
allows us to correctly quote the password argument when passed to the
mysql client program.  Addendum:  Put this check inside of a shell fn
to simplify the code.
2006-11-15 09:54:54 -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