mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52127 commits 2774 branches 343 tags 1.6 GiB
Commit graph

409 commits

Author SHA1 Message Date
kostja@bodhi.(none)
bffc615e6c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-15 16:59:43 +03:00
anozdrin/alik@station.
151444c626 Merge station.:/mnt/raid/alik/MySQL/devel/5.1 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2007-12-14 16:30:22 +03:00
tomas@whalegate.ndb.mysql.com
0bd2a86e90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-14 06:55:44 +01:00
gluh@mysql.com/eagle.(none)
b371f6385d additional after merge fix 2007-12-13 21:34:05 +04:00
tomas@whalegate.ndb.mysql.com
4b5e9edd69 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-13 14:26:57 +01:00
gluh@eagle.(none)
4f5868114a Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 15:56:04 +04:00
anozdrin/alik@station.
93eef1ce40 Merge station.:/mnt/raid/alik/MySQL/devel/5.1 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2007-12-13 12:06:37 +03:00
kostja@bodhi.(none)
657ce57e4e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-12713-1
 2007-12-12 18:36:10 +03:00
kostja@bodhi.(none)
ebb9c5d983 Bug#12713 "Error in a stored function called from a SELECT doesn't 
cause ROLLBACK of statement", part 1. Review fixes.

Do not send OK/EOF packets to the client until we reached the end of 
the current statement.
This is a consolidation, to keep the functionality that is shared by all 
SQL statements in one place in the server.
Currently this functionality includes:
- close_thread_tables()
- log_slow_statement().

After this patch and the subsequent patch for Bug#12713, it shall also include:
- ha_autocommit_or_rollback()
- net_end_statement()
- query_cache_end_of_result().

In future it may also include:
- mysql_reset_thd_for_next_command().
 2007-12-12 18:21:01 +03:00
istruewing@stella.local
03d99c5956 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 21:37:33 +01:00
tomas@whalegate.ndb.mysql.com
2a01585422 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-11 21:02:29 +01:00
tomas@whalegate.ndb.mysql.com
5e9c092c5d move randomly failing tests to ndb_team suite 2007-12-11 19:57:26 +01:00
tomas@whalegate.ndb.mysql.com
ddc2ee655f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-11 16:08:52 +01:00
tomas@whalegate.ndb.mysql.com
48c509a2aa bug#32759 already fixed 2007-12-11 15:08:00 +01:00
mskold/marty@mysql.com/quadfish.(none)
4f8101c863 Enabled test rpl_ndb_ddl 2007-12-11 11:51:14 +01:00
tomas@whalegate.ndb.mysql.com
57c890d501 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-10 13:32:19 +01:00
tomas@whalegate.ndb.mysql.com
4740565ebb backport test for bug#30674 
(bug not present in 5.1)
 2007-12-10 13:29:23 +01:00
df@pippilotta.erinye.com
3f79b0f108 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-12-10 10:46:00 +01:00
tomas@whalegate.ndb.mysql.com
541db60153 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-10 10:32:21 +01:00
tomas@whalegate.ndb.mysql.com
9eb0ef8914 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-10 10:26:01 +01:00
mskold/marty@mysql.com/quadfish.(none)
4dcfb096d7 bug#21072 Duplicate key error in NDB references wrong key: regenerated result 2007-12-07 12:20:04 +01:00
mskold/marty@mysql.com/quadfish.(none)
af908e61b7 bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes 2007-12-07 11:05:19 +01:00
mleich@five.local.lan
dba250956a Fix for 
Bug#32856 testsuite parts: partition_basic_myisam fails 
                              in pushbuild
Skip test if symlink support is missing.
 2007-12-06 18:26:50 +01:00
holyfoot/hf@hfmain.(none)
18e6de9f15 Merge mysql.com:/home/hf/work/32247/my51-32247 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-06 16:43:52 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
dc01dba255 Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table). 
ha_partition::update_create_info() just calls update_create_info
of a first partition, so only get the autoincrement maximum
of the first partition, so SHOW CREATE TABLE can show
small AUTO_INCREMENT parameters.
Fixed by implementing ha_partition::update_create_info() in a way
other handlers work.
HA_ARCHIVE:stats.auto_increment handling made consistent with other engines
 2007-12-06 16:39:42 +04:00
tsmith@ramayana.hindu.god
8fc0bfb6b6 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
 2007-12-05 12:33:36 -07:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
87bf7eff92 after-merge fix: 
- result adjusted.
 2007-11-29 22:32:34 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
ec0ce5ea03 Merge mysql.com:/home/ram/work/b32726/b32726.5.0 
into  mysql.com:/home/ram/work/b32726/b32726.5.1
 2007-11-29 14:35:15 +04:00
df@pippilotta.erinye.com
4530750499 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-11-28 19:49:29 +01:00
istruewing@stella.local
4d38a04665 Bug#8693 Test 'rpl_log_pos' fails sometimes 
Moved disabling to rpl suite.
Bug#32801 wait_timeout.test fails randomly
Disabled test case.
 2007-11-28 10:00:23 +01:00
tomas@whalegate.ndb.mysql.com
88da58090d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-11-28 08:57:31 +01:00
istruewing@stella.local
da28f9eac4 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-11-27 19:29:10 +01:00
mkindahl@dl145h.mysql.com
b1428496df Disabling several tests that fail and reported as errors. 2007-11-27 11:02:00 +01:00
hhunger@hh-nb.hhunger
aa30bc517d post merge fix for bug#32496. 2007-11-26 22:50:12 +01:00
hhunger@hh-nb.hhunger
a075c70588 Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496 
into  hh-nb.hhunger:/work/merge/mysql-5.1-32496
 2007-11-26 22:19:39 +01:00
hhunger@hh-nb.hhunger
10ea2aa927 patch for bug#32496 (2nd) with ansi conformant and Mysql test case. 2007-11-26 21:28:01 +01:00
msvensson@pilot.mysql.com
ec08b4a405 Remove disabling of testcases 2007-11-26 20:05:52 +01:00
istruewing@stella.local
010d82753d Moved disabling of tests to the respective suites. 2007-11-26 17:31:53 +01:00
mkindahl@dl145h.mysql.com
3f1c8ab526 Disabling testcases that have warnings that PB cannot handle. 2007-11-26 16:20:37 +01:00
mkindahl@dl145h.mysql.com
ebbcf7a6e2 Disabling failing test that has been reported as bug. 2007-11-26 15:36:23 +01:00
istruewing@stella.local
13c4f25fcf Bug#32668 - rpl_row_charset_innodb.test fails 
The test case fails on "vanilla" and "no_innodb" builds.
These builds do not include InnoDB.
The test case requires InnoDB.

Added requirement for InnoDB into the test case, so that
it does not start on those builds.
 2007-11-23 18:05:45 +01:00
gkodinov/kgeorge@magare.gmz
b35e378f6b Merge magare.gmz:/home/kgeorge/mysql/work/B32400-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B32400-5.1-opt
 2007-11-23 14:41:47 +02:00
mkindahl@dl145h.mysql.com
93d9d62353 Post-merge fixes. 2007-11-23 12:51:14 +01:00
serg@janus.mylan
ad1b342b30 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-11-21 21:29:16 +01:00
mkindahl@dl145h.mysql.com
0c7f3bdeba Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2007-11-21 21:15:33 +01:00
istruewing@stella.local
3be5815015 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-11-21 20:32:58 +01:00
mleich@five.local.lan
6ffbe3d076 Merge five.local.lan:/work/merge/mysql-5.0-build-30418 
into  five.local.lan:/work/merge/mysql-5.1-build-31610
 2007-11-21 15:06:38 +01:00
mleich@five.local.lan
4922727fb7 This changeset fixes 
Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.
 2007-11-21 13:50:17 +01:00
mleich@five.local.lan
12e5d5b6be Fixes for the bugs 
Bug#31610 Remove outdated and redundant tests:
                 partition_02myisam partition_03ndb
       Bug#32405 testsuite parts: partition_char_myisam wrong content
and cleanup of testsuite
   - remove/correct wrong comments
   - remove workarounds for fixed bugs
   - replace error numbers with error names
   - exclude subtests from execution which fail now because of
     new limitations for partitioning functions
   - remove code for the no more intended dual use
     fast test in regression tests/slow test in testsuite
   - analyze and fix problems with partition_char_innodb
   - fix problems caused by last change of error numbers
   - Introduce error name to error number mapping which makes
     maintenance after next error renumbering easier
 2007-11-20 16:04:07 +01:00
mskold/marty@quadfish.(none)
1f244fad80 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
 2007-11-20 14:37:36 +01:00