mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40456 commits 2785 branches 343 tags 1.6 GiB
Commit graph

40456 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mats@romeo.(none)
fd810905e9 Merge romeo.(none):/home/bkroot/mysql-5.1 
into  romeo.(none):/home/bk/memcheck-mysql-5.1
 2006-11-16 08:47:47 +01:00
andrey@example.com
85da10fa2a post-merge fix 2006-11-15 20:42:13 +01: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
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
mats@romeo.(none)
1cff21b531 Changeset to fix a valgrind error in the main tree. 
Adding class to handle temporary allocate of memory during write of rows.
Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().
 2006-11-15 16:49:03 +01:00
tnurnberg@salvation.intern.azundris.com
53b97915c6 manual merge for 16456 2006-11-15 16:08:47 +01:00
tnurnberg@salvation.intern.azundris.com
1a705351cd 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 16:05:27 +01: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
b27a4bb881 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my51-bug17700 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-15 10:02:51 -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
17a4cb2b93 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my51-bug17700
 2006-11-15 09:56:01 -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
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
lars@black.(none)
0791f80865 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-15 13:17:43 +01:00
lars@mysql.com/black.(none)
8da4385e3d Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-15 13:11:25 +01:00
lars@mysql.com/black.(none)
a265af4229 disabled test case that is still disabled in main 2006-11-15 13:05:13 +01:00
lars@black.(none)
866b998b06 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-15 12:42:45 +01:00
lars@mysql.com/black.(none)
021d85f032 Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-15 12:41:51 +01:00
lars@black.(none)
3ecf6b3453 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-15 12:40:48 +01:00
lars@mysql.com/black.(none)
ea3915dbe5 Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-15 12:40:07 +01:00
lars@mysql.com/black.(none)
a6801d4fe4 Merge mysql.com:/home/bkroot/mysql-4.1-rpl 
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
 2006-11-15 12:39:21 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
3af7d5fa9d Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
 2006-11-15 13:05:37 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
10767f3f9a Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/4.1 
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
 2006-11-15 12:55:43 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
5235785b2e bug#19402 SQL close to the size of the max_allowed_packet fails on the slave 
mending windows test.
 2006-11-15 12:53:07 +02: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)
460e90a1c1 Fix spelling error 2006-11-15 10:26:14 +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
df@kahlann.erinye.com
fc4530f1bd Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 15:27:55 +01:00
df@kahlann.erinye.com
68335d812d Merge dev:my/mysql-5.0-release 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 14:58:59 +01:00
df@kahlann.erinye.com
a3d8fdbeb9 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/51
 2006-11-14 14:49:45 +01:00