mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40186 commits 2793 branches 343 tags 1.7 GiB
Commit graph

15020 commits

Author SHA1 Message Date
iggy/Administrator@amd64.
bef72abf33 Merge amd64.:D:/src/mysql-5.1-maint 
into  amd64.:D:/src/mysql-5.1-maint_bug23983
 2006-11-17 17:34:55 -05:00
iggy/Administrator@amd64.
5c5b24a114 Bug#23983 ps.test fails to open shared library. 
- When a shared library argument is supplied, it's checked for an OS
specific directory separator.  The expected error is different
depending on the separator used. Created OS specific versions of these
tests.
 2006-11-17 16:52:41 -05:00
tnurnberg@salvation.intern.azundris.com
be53d55d28 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456
 2006-11-17 21:32:08 +01:00
tnurnberg@salvation.intern.azundris.com
655056d32f Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR 
Fix tests for new behaviour: an error is thrown if a NON DETERMINISTIC
stored function (SF) is called during statement-based replication (SBR).
 2006-11-17 21:30:28 +01:00
msvensson@neptunus.(none)
dc9c3b5ad6 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-17 14:45:08 +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)
2f8ed16868 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-17 12:43:30 +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
df968abe3a Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug24219/my51
 2006-11-16 16:44:08 +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
msvensson@neptunus.(none)
e26040dd09 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-16 16:00:26 +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
ebe1abf062 Merge example.com:/work/bug24219/my50 
into  example.com:/work/bug24219/my51
 2006-11-16 14:16:32 +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@myoffice.izhnet.ru
82b82b0df3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug23653/my51-bug23653
 2006-11-16 16:15:33 +04:00
ramil/ram@myoffice.izhnet.ru
6ce719c515 Merge mysql.com:/usr/home/ram/work/bug23653/my50-bug23653 
into  mysql.com:/usr/home/ram/work/bug23653/my51-bug23653
 2006-11-16 16:11:21 +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
andrey@example.com
85da10fa2a post-merge fix 2006-11-15 20:42:13 +01:00
cmiller@zippy.cornsilk.net
cba50775f7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-15 12:29:24 -05: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
19b3bf2963 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my50-bug19955 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my51-bug19955
 2006-11-15 12:24:21 -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
tnurnberg@salvation.intern.azundris.com
53b97915c6 manual merge for 16456 2006-11-15 16:08:47 +01:00
tnurnberg@salvation.intern.azundris.com
95fabc6522 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456
 2006-11-15 15:47:29 +01:00
msvensson@neptunus.(none)
46a599d868 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-15 13:23:42 +01:00
msvensson@neptunus.(none)
c9b4603f90 Update result file for mysql_upgrade as we have more tables that is checked in 5.1 
Fix merge errors
 2006-11-15 13:22:38 +01: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)
9f22fecf72 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-15 10:31:23 +01:00
msvensson@neptunus.(none)
15c3ed7517 Cleanup after test cases 2006-11-15 10:23:27 +01:00
tnurnberg@salvation.intern.azundris.com
c5c46ca483 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456
 2006-11-15 01:58:11 +01:00
tnurnberg@salvation.intern.azundris.com
ea3bf1b247 Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR" 
calling (rather than defining) non-deterministic SP in SBR (as opposed
to RBR or mixed) will throw an error now.

require mixed mode for tests now. SBR will now fail when calling
non-deter SPs and SFs (as it should), and RBR already failed by virtue of
giving different results for "show binlog" than the results-file has.
also test for 16456 now. lastly make amends because one of the tests
fails with a new error # now as code was added to sql_trigger.cc while
test was disabled.
 2006-11-15 01:27:39 +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
andrey@example.com
53b0176fbe Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug23760/my51
 2006-11-14 20:38:19 +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
d57ceecb77 Merge example.com:/work/bug23760/my50 
into  example.com:/work/bug23760/my51
 2006-11-14 19:10:29 +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