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

49184 commits

This branch
This branch
All branches
Author SHA1 Message Date
gshchepa/uchum@gleb.loc
be6ee4314e Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 16:16:50 +05:00
gshchepa/uchum@gleb.loc
b9b2546a38 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 14:27:06 +05:00
mats@kindahl-laptop.dnsalias.net
f8692e4cc9 Minor fix to let the build proceed. 2007-08-17 13:22:31 +02:00
holyfoot/hf@hfmain.(none)
4c2b95b62c Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/27405/my51-27405
 2007-08-17 16:15:09 +05: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
igor@olga.mysql.com
3d44204e84 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396
 2007-08-16 21:04:28 -07:00
igor@olga.mysql.com
37f3a92a42 Post-merge fix. 2007-08-16 19:27:44 -07:00
igor@olga.mysql.com
ff3f6e806b Merge olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30396
 2007-08-16 17:22:50 -07:00
lars/lthalmann@mysql.com/localhost.localdomain.(none)
4ecac78ff7 Empty changeset to restart pushbuild 2007-08-17 00:10:46 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
aba3a3b49d Post-merge fix of error number 2007-08-16 17:26:32 +02:00
mhansson@dl145s.mysql.com
4fdadd620d Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/mhansson/my50-bug28570
 2007-08-16 14:13:07 +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
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
igor@olga.mysql.com
d790ec42e1 Fixed bug #30396. 
The bug caused memory corruption for some queries with top OR level
in the WHERE condition if they contained equality predicates and 
other sargable predicates in disjunctive parts of the condition.

The corruption happened because the upper bound of the memory
allocated for KEY_FIELD and SARGABLE_PARAM internal structures
containing info about potential lookup keys was calculated incorrectly
in some cases. In particular it was calculated incorrectly when the
WHERE condition was an OR formula with disjuncts being AND formulas
including equalities and other sargable predicates.
 2007-08-15 10:24:18 -07:00
skozlov/ksm@mysql.com/virtop.localdomain
6a58417c09 fixed diff 2007-08-15 18:41:18 +04:00
evgen@moonbone.local
222fddcb79 mysql_client_test.c: 
Post fix for the bug#29948.
 2007-08-15 18:21:58 +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
mhansson@dl145s.mysql.com
68048e4266 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data0/mhansson/my51-bug28570
 2007-08-15 12:42:39 +02:00
mhansson/martin@linux-st28.site
eb35a8764f Merge linux-st28.site:/home/martin/mysql/src/bug28570/my50-bug28570 
into  linux-st28.site:/home/martin/mysql/src/bug28570/my51-bug28570
 2007-08-15 12:03:11 +02:00
mhansson/martin@linux-st28.site
1da8451d4d bug#28570: handler::index_read() is called with different find_flag when 
ORDER BY is used

The range analysis module did not correctly signal to the 
handler that a range represents a ref (EQ_RANGE flag). This causes 
non-range queries like 
SELECT ... FROM ... WHERE keypart_1=const, ..., keypart_n=const 
ORDER BY ... FOR UPDATE
to wait for a lock unneccesarily if another running transaction uses
SELECT ... FOR UPDATE on the same table.

Fixed by setting EQ_RANGE for all range accesses that represent 
an equality predicate.
 2007-08-15 09:23:44 +02:00
evgen@moonbone.local
1cc8f0e383 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29948-bug-5.0-opt-mysql
 2007-08-14 18:16:34 +04:00
evgen@moonbone.local
4bc4d834fd Bug#29948: Unchecked NULL pointer caused server crash. 
The cli_read_binary_rows function is used to fetch data from the server
after a prepared statement execution. It accepts a statement handler and gets
the connection handler from it. But when the auto-reconnect option is set
the connection handler is reset to NULL after reconnection because the
prepared statement is lost and the handler became useless. This case
wasn't checked in the cli_read_binary_rows function and caused server crash.

Now the cli_read_binary_rows function checks the connection handler to be
not NULL and returns an error if it is.
 2007-08-14 17:28:51 +04: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
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
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
skozlov/ksm@virtop.localdomain
866aa75617 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
 2007-08-13 13:03:33 +04:00
gshchepa/uchum@gleb.loc
3368d2fb6b Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-11 03:37:43 +05:00
jmiller/ndbdev@ndb08.mysql.com
57df03de46 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/data2/mysql-5.1-new-rpl-30128-30209
 2007-08-11 00:08:00 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
cc5c5bed9c rpl_packet.test: 
Changed patch to Mats suggestion from review. Patch is for Bug#30209
.del-wait_for_slave_running_off.inc:
  Delete: mysql-test/include/wait_for_slave_running_off.inc
 2007-08-11 00:07:11 +02:00
gshchepa/uchum@gleb.loc
db6ec3f71f Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-11 02:00:51 +05:00
gshchepa/uchum@gleb.loc
c04f57ccef Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-11 01:32:04 +05:00
gshchepa/uchum@gleb.loc
1b70ffee32 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-11 01:27:06 +05:00
cbell/Chuck@mysql_cab_desk.
6497bd2f9e Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
 2007-08-10 15:15:20 -04:00
cbell/Chuck@mysql_cab_desk.
08282643ab Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_22086
 2007-08-10 14:58:46 -04:00
cbell/Chuck@mysql_cab_desk.
e8ea4b84c0 BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
This patch adds functionality to row-based replication to ensure the
slave's column sizes are >= to that of the master.

It also includes some refactoring for the code from WL#3228.
 2007-08-10 12:48:01 -04:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
2ba264d812 rpl_packet.test: 
Updated test to use new include function
wait_for_slave_running_off.inc:
  Created new include to resolve the timing issue recorded by Bug#30209
rpl_events.inc:
  The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.
 2007-08-09 23:18:44 +02:00
skozlov/ksm@virtop.localdomain
271178ce70 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
 2007-08-08 21:27:58 +04:00
kostja@bodhi.(none)
3ecef8c0b9 A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system 2007-08-08 15:49:19 +04:00