database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00
Code Activity
60,132 Commits 3,264 Branches 1,096 Tags
b51887113054d7182100dd7173fdf44fb65e2db1
Commit Graph

1167 Commits

Author SHA1 Message Date
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
acurtis/antony@ltamd64.xiphis.org
424857e0e4 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/engines-merge
 2006-09-18 12:16:03 -07:00
svoj@april.(none)
36be4318da Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-18 20:43:36 +05:00
mleich@three.local.lan
5f5d1507ec 1. Cumulated fix for Bug#22398, #22404 and #22405 
2. Correct some logical bugs within the tests, which were caused by
   automatic resolve of BitKeeper
 2006-09-18 16:55:56 +02:00
svoj@april.(none)
419a51c5a5 Merge april.(none):/home/svoj/devel/bk/mysql-5.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-18 19:43:33 +05:00
svoj@april.(none)
f21eadfc74 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2006-09-18 16:23:45 +05:00
msvensson@shellback.(none)
16c07bd02c No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore 
when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.
 2006-09-18 12:45:04 +02:00
aelkin/elkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi
6055e8a9f7 Bug#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage 
A query SET @@GLOBAL.binlog_format = ... returns an error when NDB is the
default storage. This fails some tests invoking the set binlog_format explicitly.
because the var turns to be read-only.
  
  In the following are files and method to fix if needed.
  
  t/
  ndb_binlog_basic2.test         # here the failure is benign
  rpl_rbr_to_sbr.test            # does not check any ndb features =>           
 
  .                              # => not_ndb_default is enough
  rpl_row_basic_8partition.test  # set binlog_format can be replaced
  rpl_switch_stm_row_mixed.test  # does not check any ndb features =>
  .                              # => not_ndb_default is enough
  
  two more invoking invoke extra/rpl_truncate_helper.test
  
  rpl_truncate_2myisam           # to be fixed with not_ndb_default
  rpl_truncate_3innodb           # same as above
  .                              # because there is a dedicated to ndb .        
 
  .                              # rpl_truncate_7ndb* suit.

Adapting/testing a new implement
--source include/safe_set_to_maybe_ro_var.inc
to avoid abort due to the error using binlog_format as application.
 2006-09-15 17:25:13 +03:00
ramil/ram@myoffice.izhnet.ru
8445f3e3de Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
 2006-09-15 14:15:09 +05:00
dlenev@mockturtle.local
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-14 23:53:35 +04:00
istruewing@chilla.local
22d8c89d6e Merge chilla.local:/home/mydev/mysql-5.1--main 
into  chilla.local:/home/mydev/mysql-5.1-toteam
 2006-09-14 21:44:17 +02:00