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

49252 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.(none)
0b8d2a92b1 Merge 192.168.0.7:mysql/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 15:15:44 +02:00
msvensson@shellback.(none)
cbecd2007e Make it possible to pass mysql-test-run.pl test cases to run 
also on the <suite>.<testname> format
 2007-08-20 15:12:14 +02:00
msvensson@pilot.(none)
346e565981 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 13:48:46 +02:00
msvensson@pilot.(none)
2b8218d334 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 13:48:04 +02:00
msvensson@pilot.(none)
d2fdcd908a Merge pilot.(none):/data/msvensson/mysql/work/my51-work 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 13:47:31 +02:00
msvensson@pilot.(none)
f773863767 Merge pilot.(none):/data/msvensson/mysql/work/my50-work 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-20 13:46:57 +02:00
msvensson@pilot.(none)
0b80907150 Only install second master db if using second master 2007-08-20 13:46:42 +02:00
msvensson@pilot.(none)
cd7fdee0f7 Merge pilot.(none):/data/msvensson/mysql/work/my50-work 
into  pilot.(none):/data/msvensson/mysql/work/my51-work
 2007-08-20 13:45:32 +02:00
tsmith@ramayana.hindu.god
76d173fa9d Bug #29307: status.test fails with different Table_locks_immediate 
Finish premature patch which was accidentally pushed; remove debugging
info and correct the test.
 2007-08-18 02:28:08 -06:00
tsmith@ramayana.hindu.god
2ccc363634 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-18 00:37:35 -06:00
tsmith@ramayana.hindu.god
a7b5c540ba Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-18 00:36:18 -06:00
tsmith@ramayana.hindu.god
88444351c2 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-18 00:35:41 -06:00
tsmith@ramayana.hindu.god
c23b736ed3 Bug #29307: status.test fails with different Table_locks_immediate 
When using --log --log-output=table, we increment Table_locks_immediate
with every query.  The wait_condition.inc runs a query a variable number
of times, depending on server load, etc.  This is a problem, when the
test is checking the Table_locks_immediate value.

Fix is to adjust the Table_locks_immediate value based on how many times
the wait_condition query was executed.
 2007-08-17 19:29:08 -06:00
mats@kindahl-laptop.dnsalias.net
f8692e4cc9 Minor fix to let the build proceed. 2007-08-17 13:22:31 +02:00
mats@kindahl-laptop.dnsalias.net
112c64a00d Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
 2007-08-17 11:00:03 +02:00
lars/lthalmann@mysql.com/localhost.localdomain.(none)
4ecac78ff7 Empty changeset to restart pushbuild 2007-08-17 00:10:46 +02:00
tsmith@ramayana.hindu.god
18ffae6ab6 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-16 12:03:49 -06:00
tsmith@ramayana.hindu.god
49891223c3 Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE 
Revert the fix for bug 21587.  That bug will be re-opened, and a new
fix must be created.
 2007-08-16 10:56:09 -06:00
lars/lthalmann@mysql.com/dl145k.mysql.com
aba3a3b49d Post-merge fix of error number 2007-08-16 17:26:32 +02:00
mats@kindahl-laptop.dnsalias.net
1b85aab28a Minor code fixes to help Doxygen generate good documentation. 2007-08-16 11:43:03 +02:00
mats@kindahl-laptop.dnsalias.net
1fc1bd7f53 Renaming MASTER_INFO to Master_info in order to follow the coding 
standards (and help Doxygen generating good documentation).
 2007-08-16 08:52:50 +02:00
mats@kindahl-laptop.dnsalias.net
9c4ef25c55 Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards 
(and be more friendly to Doxygen by removing unnecessary typedefs).
 2007-08-16 07:37:50 +02:00
tsmith@ramayana.hindu.god
9c1f5867a5 Merge ramayana.hindu.god:/home/tsmith/m/bk/inno/aug13/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/inno/aug13/51
 2007-08-15 17:44:25 -06:00
tsmith@ramayana.hindu.god
5e926bc120 NULL MERGE this ChangeSet to 5.1 
Apply innodb-5.0-ss1696 snapshot

Fixes:
- Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
- Bug#23710: crash_commit_before fails if innodb_file_per_table=1
  At InnoDB startup consider the case where log scan went beyond
  checkpoint_lsn as a crash and initiate crash recovery code path.
- Bug#28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE
  We need to do some special AUTOINC handling for the following case:
  INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
  We need to use the AUTOINC counter that was actually used by
  MySQL in the UPDATE statement, which can be different from the
  value used in the INSERT statement.
- Bug#29097: fsp_get_available_space_in_free_extents() is capped at 4TB
  Fix by typecasting the variables before multiplying them, so that the
  result of the multiplication is of type "unsigned long long".
- Bug#29155: Innodb "Parallel recovery" is not prevented
  Fix by enabling file locking on FreeBSD.  It has been disabled because
  InnoDB has refused to start on FreeBSD & LinuxThreads, but now it
  starts just fine.
 2007-08-15 17:20:54 -06:00
tsmith@ramayana.hindu.god
431b49559b Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-15 15:49:58 -06:00
tsmith@ramayana.hindu.god
a5fdd2332b Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-15 15:48:57 -06:00
tsmith@ramayana.hindu.god
e2d64f2878 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-15 15:48:03 -06:00
lars/lthalmann@dl145h.mysql.com
db20ce753f Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-08-15 21:53:24 +02:00
lars/lthalmann@dl145h.mysql.com
0498177909 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-08-15 21:50:38 +02:00
lars/lthalmann@dl145k.mysql.com
2c893c14da Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-08-15 21:30:45 +02:00
lars/lthalmann@dl145k.mysql.com
4000c96a70 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-08-15 21:26:47 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
75925a197c Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-08-15 21:26:10 +02:00
skozlov/ksm@mysql.com/virtop.localdomain
6a58417c09 fixed diff 2007-08-15 18:41:18 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
32ede8aa52 disabled rpl_innodb_mixed_dml 2007-08-15 15:51:27 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
54e5802e5d Fixed path to tmp directory for rpl_mixed_dml.inc 2007-08-15 14:53:14 +04:00
tsmith@ramayana.hindu.god
badc34bd81 Update result formatting for embedded runs of ps_1general and 
trigger tests, to match build_table_filename behavior.
 2007-08-15 02:18:41 -06:00
tsmith@ramayana.hindu.god
fa9bacb25c Updates to allow innodb.test to be run with --embedded-server, 
including a small change to build_table_filename().
 2007-08-14 15:35:19 -06:00
gshchepa/uchum@gleb.loc
9308d43490 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-14 15:39:57 +05:00
msvensson@pilot.(none)
054ab36fcf Remove unused variable 2007-08-14 11:10:23 +02:00
msvensson@pilot.(none)
c446c0006e Remove unused variables 2007-08-14 11:05:42 +02:00
gshchepa/uchum@gleb.loc
67c586ff5c Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-14 13:45:49 +05:00
gshchepa/uchum@gleb.loc
c40fe57fb5 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-14 13:44:15 +05:00
istruewing@synthia.local
50e3da81c2 Merge synthia.local:/home/mydev/mysql-5.0-axmrg 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-08-13 23:49:07 +02:00
istruewing@synthia.local
6d67419fb6 Merge synthia.local:/home/mydev/mysql-5.1-amain 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-08-13 23:46:25 +02:00
istruewing@synthia.local
6c95ced6c1 Merge synthia.local:/home/mydev/mysql-4.1-axmrg 
into  synthia.local:/home/mydev/mysql-5.0-axmrg
 2007-08-13 22:00:30 +02:00
tsmith@ramayana.hindu.god
bde833896a Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-13 12:47:12 -06:00
tsmith@ramayana.hindu.god
541203b360 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-13 12:46:35 -06:00
tsmith@ramayana.hindu.god
7812c2d38a Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-13 12:46:02 -06:00
istruewing@synthia.local
f0c883f3fb Merge synthia.local:/home/mydev/mysql-5.0-amain 
into  synthia.local:/home/mydev/mysql-5.0-axmrg
 2007-08-13 20:45:36 +02:00
istruewing@synthia.local
45647d3bd9 Merge synthia.local:/home/mydev/mysql-4.1-amain 
into  synthia.local:/home/mydev/mysql-4.1-axmrg
 2007-08-13 19:22:35 +02:00