mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47969 commits 2791 branches 343 tags 1.7 GiB
Commit graph

18600 commits

Author SHA1 Message Date
holyfoot/hf@mysql.com/hfmain.(none)
38991f3e80 merging fix 2007-06-22 09:59:23 +05:00
holyfoot/hf@hfmain.(none)
faa251305c Merge mysql.com:/home/hf/work/28839/my50-28839 
into  mysql.com:/home/hf/work/28839/my51-28839
 2007-06-22 09:33:03 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
78c53ea32e rpl_skip_error.test fixed 2007-06-22 09:28:38 +05:00
dkatz@damien-katzs-computer.local
0d84133a4c Merge damien-katzs-computer.local:/Users/dkatz/50_kill 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-06-21 22:08:14 -04:00
dkatz@damien-katzs-computer.local
a393b215fb Bug #29138 'kill' fails in pushbuild 
The reason the "reap;" succeeds unexpectedly is because the query was completing(almost always) and the network buffer was big enough to store the query result (sometimes) on Windows, meaning the response was completely sent before the server thread could be killed.

Therefore we use a much longer running query that doesn't have a chance to fully complete before the reap happens, testing the kill properly.
 2007-06-21 21:39:52 -04:00
tsmith@maint1.mysql.com
8a946f5596 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-22 01:43:57 +02:00
igor@olga.mysql.com
802dcc7a45 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29104
 2007-06-21 15:25:23 -07:00
tsmith@maint1.mysql.com
28242f775c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-21 22:10:40 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
5847f02846 Disabled new test cases that are not 100% stable yet 2007-06-21 22:07:21 +02:00
tsmith@maint1.mysql.com
8ee2c2b04e Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-21 20:55:37 +02:00
tsmith@maint1.mysql.com
b8881ebfd4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-21 20:09:04 +02:00
tsmith@maint1.mysql.com
3ae37d30de Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-21 18:58:31 +02:00
iggy@amd64.(none)
08cb616544 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  amd64.(none):/src/bug27029/my51-bug27029
 2007-06-21 12:53:03 -04:00
iggy@amd64.(none)
1378e94aa0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  amd64.(none):/src/bug27029/my50-bug27029
 2007-06-21 12:52:20 -04:00
iggy@amd64.(none)
adcf736687 Merge amd64.(none):/src/bug27029/my50-bug27029 
into  amd64.(none):/src/bug27029/my51-bug27029
 2007-06-21 12:47:55 -04:00
iggy@amd64.(none)
39416f50a5 Bug#27029 alter table ... enable keys crashes mysqld on large table 
- When creating an index for the sort, the number of rows plus 1 is used 
to allocate a buffer.  In this test case, the number of rows 4294967295 
is the max value of an unsigned integer, so when 1 was added to it, a 
buffer of size 0 was allocated causing the crash.
- Create new test suite for this bug's test suite as per QA.
 2007-06-21 12:45:56 -04:00
tsmith@maint1.mysql.com
f1e600a78e Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-21 18:28:52 +02:00
lars/lthalmann@dl145k.mysql.com
5c667b6fa5 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-06-21 17:13:02 +02:00
lars/lthalmann@dl145j.mysql.com
d0e786b8e9 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-06-21 17:10:35 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
c1f2050087 merge rpl 5.0->5.1 2007-06-21 17:09:19 +02:00
lars/lthalmann@dl145k.mysql.com
1fb2aa8205 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-06-21 17:04:33 +02:00
msvensson@pilot.(none)
8e65f66378 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-21 16:58:22 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
fcd859ac77 Test fix 2007-06-21 16:55:52 +02:00
msvensson@pilot.(none)
840344589e Add name of test that generated the warning to "warnings" file 2007-06-21 16:37:13 +02:00
msvensson@pilot.(none)
9ece930cd4 Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-21 15:19:28 +02:00
msvensson@pilot.(none)
c021fc9a92 Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-21 15:14:00 +02:00
mats@kindahl-laptop.dnsalias.net
7438faa16b Test case fix to replication team tree. 2007-06-21 14:39:40 +02:00
msvensson@pilot.(none)
896faea0d3 Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-21 14:14:36 +02:00
msvensson@pilot.(none)
f3f1c8c18e Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-21 14:10:35 +02:00
holyfoot/hf@hfmain.(none)
372c5e23bd Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/28839/my50-28839
 2007-06-21 15:28:19 +05:00
holyfoot/hf@hfmain.(none)
caa38fc80d Merge mysql.com:/home/hf/work/28839/my50-28839 
into  mysql.com:/home/hf/work/28839/my51-28839
 2007-06-21 15:27:12 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
a5b37d95ff rpl_skip_error test fixed 2007-06-21 15:25:28 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
03d657f60e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b28772/b28772.5.1
 2007-06-21 13:26:17 +05:00
mats@kindahl-laptop.dnsalias.net
201a254788 Fixing result mismatch in rpl_deadlock_innodb result file. 2007-06-21 09:31:19 +02:00
holyfoot/hf@hfmain.(none)
56be687ce8 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28839/my51-28839
 2007-06-21 12:07:52 +05:00
holyfoot/hf@hfmain.(none)
8a6b7f7cca Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/28839/my50-28839
 2007-06-21 12:04:13 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
67fcb4c3e2 merging 2007-06-21 11:48:01 +05:00
gshchepa/uchum@gleb.loc
1b5d893122 Fixed bug #28293. 
Occasionally mysqlbinlog --hexdump failed with error:
  ERROR 1064 (42000) at line ...: You have an error in your
  SQL syntax; check the manual that corresponds to your MySQL
  server version for the right syntax to use near
  'Query thread_id=... exec_time=... error_code=...

When the length of hexadecimal dump of binlog header was
divisible by 16, commentary sign '#' after header was lost.
The Log_event::print_header function has been modified to always
finish hexadecimal binlog header with "\n# ".
 2007-06-21 02:11:28 +05:00
igor@olga.mysql.com
c6cc50960b Fixed bug #29104: assertion abort for grouping queries using views. 
The abort happened when a query contained a conjunctive predicate
of the form 'view column = constant' in the WHERE condition and 
the grouping list also contained a reference to a view column yet
a different one.

Removed the failing assertion as invalid in a general case.

Also fixed a bug that prevented applying some optimization for grouping
queries using views. If the WHERE condition of such a query contains
a conjunctive condition of the form 'view column = constant' and
this view column is used in the grouping list then grouping by this
column can be eliminated. The bug blocked performing this elimination.
 2007-06-20 12:43:14 -07:00
kostja@bodhi.(none)
72ff5488be Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-06-20 19:05:38 +04:00
gkodinov/kgeorge@magare.gmz
23bac8d8df fixed a (merge?) problem running the tests: 
now the cluster related commands have 'use db'
in the binlog.
 2007-06-20 16:26:14 +03:00
mats@kindahl-laptop.dnsalias.net
2f74826394 BUG#29030 (DROP USER command that errors still gets written to binary log 
and replicated):

A DROP USER statement with a non-existing user was correctly written to
the binary log (there might be users that were removed, but not all),
but the error code was not set, which caused the slave to stop with an
error.

The error reporting code was moved to before the statement was logged
to ensure that the error information for the thread was correctly set
up. This works since my_error() will set the fields net.last_errno and
net.last_error for the thread that is reporting the error, and this
will then be picked up when the Query_log_event is created and written
to the binary log.
 2007-06-20 14:24:31 +02:00
kostja@bodhi.(none)
a1fefd4e8d Disable randomly failing tests: 
rpl_udf -- Bug#28993 rpl_udf test causes server crash and valgrind
warning in pushbuild
rpl_ndb_circular -- Bug#29233 rpl_ndb_circular fails randomly
ndb_dd_sql_features -- Bug#29102 ndb_dd_sql_features fails in
pushbuild
 2007-06-20 16:05:57 +04:00
gkodinov/kgeorge@magare.gmz
49e3ed9ffa port of the fix for bug 19116 4.1-opt -> 5.0-opt 2007-06-20 13:15:46 +03:00
kostja@bodhi.(none)
9ff8e6d7b5 Fix a typo. 2007-06-20 14:04:53 +04:00
msvensson@pilot.(none)
4d3f3f676f Bug#28742 mysql-test-run is very slow on "Stopping All Servers" step 
- Improve shutdown algorithm 
 - Wait up to 5 seconds for processes to exit after their port is free
 2007-06-20 11:47:55 +02:00
gkodinov/kgeorge@magare.gmz
7ec37ee3be Merge magare.gmz:/home/kgeorge/mysql/work/B29116-4.1-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B29116-5.0-opt
 2007-06-20 12:46:56 +03:00
mats@kindahl-laptop.dnsalias.net
206b2c72ba Adding missing DROP TABLE statement to ndb_backup_print.test since it 
causes later tests to fail.
 2007-06-20 11:38:51 +02:00
gshchepa/uchum@gleb.loc
88d5d8a268 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-06-20 14:22:32 +05:00
gshchepa/uchum@gleb.loc
0bd3dd9a37 metadata.test, metadata.result: 
Updated test case for bug #28898. Additional cleanup.
 2007-06-20 14:21:48 +05:00