mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42740 commits 2778 branches 343 tags 1.6 GiB
Commit graph

427 commits

Author SHA1 Message Date
malff/marcsql@weblab.(none)
48a87f8ae0 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21114_b
 2006-11-02 11:13:04 -07:00
malff/marcsql@weblab.(none)
62c242cc75 Bug#21114 (Foreign key creation fails to table with name format) 
Due to the complexity of this change, everything is documented in WL#3565

This patch is the third iteration, it takes into account the comments
received to date.
 2006-11-02 11:01:53 -07:00
thek@kpdesk.mysql.com
5f2424ead7 Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2006-11-02 08:47:21 +01:00
bar@bar.intranet.mysql.r18.ru
cefa1cf9e0 Merge mysql.com:/usr/home/bar/mysql-5.0.b18908 
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
 2006-11-01 16:48:03 +04:00
msvensson@shellback.(none)
b9d4ccbf18 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-31 19:08:30 +01:00
msvensson@shellback.(none)
2fd830c4ea Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-30 15:03:04 +01:00
msvensson@shellback.(none)
9f223873cf Bug#18654 Test is timing-dependent and fails from scheduling effects (?) 
- Wait in loop with small sleep until tables has been renamed
 2006-10-30 14:42:28 +01:00
msvensson@shellback.(none)
5a049ba807 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-30 13:45:24 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
0e3a1eece7 Bug#18908: ERROR 1406 (22001): Data too long for column :: using utf8 
Problem: Too confusing error message when cannot convert
between string and column character sets on INSERT and UPDATE.
Fix: producing a better error message, instead of "Data too long"
in such cases
Additional changes: Adding "DROP TABLE IF EXISTS" into several
tests to be safe against failures in previous tests.
 2006-10-30 10:14:03 +04:00
tsmith/tim@siva.hindu.god
837fb44170 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-10-25 17:14:32 -06:00
kroki/tomash@moonlight.intranet
25501c38d3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
 2006-10-25 20:23:41 +04:00
kroki/tomash@moonlight.intranet
7d3b9ffb65 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
 2006-10-25 20:10:12 +04:00
tsmith@maint1.mysql.com
8f75d0913b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/51
 2006-10-24 20:01:01 +02:00
msvensson@neptunus.(none)
8f5c95230b Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 18:09:38 +02:00
msvensson@neptunus.(none)
d02838deb0 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 18:08:38 +02:00
msvensson@neptunus.(none)
3df77e48af Add analyze_testcase_failure which is called when mysqltest has failed 
with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced
 2006-10-24 17:36:46 +02:00
tsmith/tim@siva.hindu.god
aeced431e3 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-10-23 23:41:07 -06:00
kostja@bodhi.local
2fecf79536 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-10-23 12:35:56 +04:00
malff/marcsql@weblab.(none)
ea0998caca Bug#20028 (Function with select return no data) 
This patch reverts a change introduced by Bug 6951, which incorrectly
set thd->abort_on_warning for stored procedures.

As per internal discussions about the SQL_MODE=TRADITIONAL,
the correct behavior is to *not* abort on warnings even inside an INSERT/UPDATE
trigger.

Tests for Stored Procedures, Stored Functions, Triggers involving SQL_MODE
have been included or revised, to reflect the intended behavior.

(reposting approved patch, to work around source control issues, no review needed)
 2006-10-19 11:39:51 -07:00
gkodinov@dl145s.mysql.com
aaed398254 Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-19 16:43:46 +02:00
msvensson@neptunus.(none)
b11dee73ca Backport test cases fixes from 5.0 2006-10-19 10:54:23 +02:00
cmiller@zippy.cornsilk.net
91c4edfbfb Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-10-17 12:00:36 -04:00
msvensson@shellback.(none)
bf762c2d9e Print names of testcases that failed check_testcase, this makes it easier 
to run the whole testcase to find wich testcases need to be checked more carefully
and the just "copy and paste" the suspicious test case names to 
a new mysql-test-run.pl command.
 2006-10-08 17:48:01 +02:00
msvensson@neptunus.(none)
5a15eeca7c Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-06 13:16:57 +02:00
msvensson@neptunus.(none)
6273db415e Merge neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-06 13:12:53 +02:00
msvensson@neptunus.(none)
e2496d3016 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-10-06 01:06:02 +02:00
msvensson@neptunus.(none)
3eaeeca6de Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
 2006-10-06 01:00:35 +02:00
msvensson@neptunus.(none)
ae4df31df4 Add printout of file in which warning was detected 
Cleanup .progress, .reject, .log and .warnings files produced by mysqltest
 2006-10-06 00:57:10 +02:00
msvensson@neptunus.(none)
bf120e18c8 Set the environment variable NDB_STATUS_OK to indicate that cluster is installed ok. This is actually not needed for this script as it will 
skip ndb tests if cluster install failed. But provided for compatibility
 2006-10-05 12:28:23 +02:00
msvensson@neptunus.(none)
8929b7a03b Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-10-04 16:35:40 +02:00
msvensson@neptunus.(none)
d8191af7ee Fixup the regex's parsing the mysqld's version and variables 
Add paths for ndb binaries
Some more backport issues
 2006-10-04 16:28:23 +02:00
msvensson@shellback.(none)
4e97643423 Delete files now moved into mysqltest.test 2006-10-03 15:59:56 +02:00
msvensson@neptunus.(none)
237779218c Merge bk-internal:/home/bk/mysql-5.1-new-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 15:56:56 +02:00
msvensson@shellback.(none)
2cea0e6b13 Update mysqltest to latest version 
- ie. backport from 5.1
 - also update testcase error dected by new version
 2006-10-03 15:33:44 +02:00
lars/lthalmann@dl145j.mysql.com
9b17d0d332 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
 2006-10-02 15:33:15 +02:00
lars/lthalmann@dl145h.mysql.com
4f2b786bf3 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-10-02 14:21:49 +02:00
mats@romeo.(none)
c8ec10e4a4 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/fix-mysql-5.1-new-rpl
 2006-10-02 14:03:54 +02:00
mats@romeo.(none)
3aaa49ed0b BUG#22550 (Replication of BIT column failing): 
Adding test case.
 2006-10-02 13:38:06 +02:00
cmiller@zippy.cornsilk.net
43bdd2c2ed Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:32:37 -04:00
cmiller@zippy.cornsilk.net
e72bc63906 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:15:32 -04:00
msvensson@neptunus.(none)
648a9ae116 Increase time to wait for mysqld to get restarted(it will take some time when running in valgrind) 2006-09-28 11:53:42 +02:00
brian@zim.(none)
0a0f1aa386 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-23 12:13:30 -07:00
cmiller@zippy.cornsilk.net
161fea4ac4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-23 09:51:20 -04:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
89bfa9544d Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
 2006-09-23 15:42:45 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
86fa300a69 binlog_row_binlog test gained some indeterministic checks with changes due to 
ChangeSet@1.2309.1.12, 2006-09-12 15:42:13+02:00, guilhem@gbichot3.local +14 -0
  Fixing problems I identified in my auto_increment work pushed in July
  (as part of the auto_increment cleanup of WL #3146; ...
The problem is in that show binlog events in indeterministic, row events can be compressed,
so that 2 seconds original delay does not guard from inconsistency.

We syncronize test's current inserted rows counter with system insert delayed thread
per each query.

From another side there is no requirement for binlog to be event per row and then 
to verify if binlog has recorded what was recently inserted is better
via reading from it instead of 'show binlog events'.
 2006-09-23 15:24:45 +03:00
brian@zim.(none)
48381342d8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-22 23:33:08 -07:00
lars/lthalmann@dl145h.mysql.com
b8556c82a9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-23 06:06:06 +02:00
msvensson@shellback.(none)
fe0cfacf35 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:31:35 +02:00
lars/lthalmann@dl145j.mysql.com
57a74ea4af Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 00:23:20 +02:00
brian@zim.(none)
63d78a7659 Removed ifdef need. 
Cleaned up test to no longer need have_
 2006-09-19 13:58:12 -07:00