mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49980 commits 2793 branches 343 tags 1.5 GiB
Commit graph

49980 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold/marty@linux.site
f2159e2d21 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-09-13 10:35:11 +02:00
mskold/marty@linux.site
d4e84e13b0 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-09-13 10:06:42 +02:00
mskold/marty@linux.site
2ea6d3d680 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-09-13 10:00:14 +02:00
mskold/marty@mysql.com/linux.site
44b6c2edad bug#27494 An invalid subselect crashes mysql server: Added check for missing arguments 2007-09-13 09:47:21 +02:00
gshchepa/uchum@gleb.loc
2e7306d503 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-09-13 11:48:58 +05:00
gshchepa/uchum@gleb.loc
2a3facc3de Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-13 11:31:45 +05:00
gshchepa/uchum@gleb.loc
321c172e95 sql_view.cc: 
Post-merge fix.
 2007-09-13 02:09:29 +05:00
gshchepa/uchum@gleb.loc
bd4fd0473c Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-13 00:44:50 +05:00
gshchepa/uchum@gleb.loc
ff042427cf Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-09-12 23:41:35 +05:00
sergefp@mysql.com
1ff0caf49d Better wording in comments 2007-09-12 18:13:19 +04:00
tomas@whalegate.ndb.mysql.com
5b0e532db3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-12 14:03:21 +02:00
tomas@whalegate.ndb.mysql.com
59e502dc2b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-12 14:02:27 +02:00
tomas@whalegate.ndb.mysql.com
df552c310d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-09-12 14:01:51 +02:00
tomas@whalegate.ndb.mysql.com
f0f025f91b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
 2007-09-12 13:58:03 +02:00
tomas@whalegate.ndb.mysql.com
63648db422 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
 2007-09-12 13:55:45 +02:00
tomas@whalegate.ndb.mysql.com
83eed4d876 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
 2007-09-12 13:55:22 +02:00
tomas@whalegate.ndb.mysql.com
461a3dccac BUG#23354 revert 2007-09-12 13:53:32 +02:00
gshchepa@bk-internal.mysql.com
ae46c7e54a Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-09-12 11:52:42 +02:00
tomas@whalegate.ndb.mysql.com
c484d9c5ef Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-12 07:37:27 +02:00
tomas@whalegate.ndb.mysql.com
f1674d1b66 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-09-12 07:34:42 +02:00
sergefp@mysql.com
06f12f66e8 Post-merge fixes 2007-09-12 01:52:27 +04:00
tomas@whalegate.ndb.mysql.com
0c0f6dfa03 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-11 19:56:26 +02:00
tomas@whalegate.ndb.mysql.com
9620892508 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-09-11 19:52:05 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
474bcd3b00 merging 2007-09-11 20:47:17 +05:00
jonas@perch.ndb.mysql.com
cf17cd229b Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2007-09-11 16:55:37 +02:00
jonas@perch.ndb.mysql.com
0b2c8fa3c4 ndb - bug#30914 
Dont add insert+delete tuple(s) to lcp-keep-list
 2007-09-11 16:45:22 +02:00
tomas@whalegate.ndb.mysql.com
9e37aaf433 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-09-11 16:17:28 +02:00
msvensson@pilot.(none)
f26d69e01a Add support for specifying suites not located in mysql-test/suite/ 
Example otions that will all run binlog_stm_binlog.test in suite/binlog:
 --suite=binlog binlog.binlog_stm_binlog
 --suite=binlog binlog_stm_binlog
 binlog_stm_binlog
 --suite=suite/binlog binlog.binlog_stm_binlog
 --suite=suite/binlog binlog_stm_binlog
 2007-09-11 15:00:52 +02:00
sergefp@mysql.com
6f702a4b42 Post-merge fixes 2007-09-11 02:41:42 +04:00
sergefp@pylon.mylan
d276ce3402 Merge mysql.com:/home/psergey/mysql-4.1-bug30385 
into  mysql.com:/home/psergey/mysql-5.0-bug30385
 2007-09-11 02:24:08 +04:00
sergefp@mysql.com
da04109de2 BUG#30385: Server crash when deleting with ORDER BY and LIMIT 
in get_index_for_order(), don't walk over the end of the index key parts
when matching index description and needed ordering.
 2007-09-10 16:26:51 +04:00
holyfoot/hf@hfmain.(none)
f57f1d0942 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28430/my51-28430
 2007-09-10 10:21:55 +05:00
jperkin@production.mysql.com
6ed2034824 Merge production.mysql.com:/usersnfs/jperkin/bk/trees/50/push-5.0 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/push-5.1
 2007-09-07 21:56:00 +02:00
jperkin@production.mysql.com
302e1811f7 Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build-gca/mysql-5.1 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
 2007-09-07 17:46:31 +02:00
jperkin@production.mysql.com
fa73a68c8b Merge production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
 2007-09-07 17:30:47 +02:00
jperkin@production.mysql.com
29b0900ddd Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27693 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0
 2007-09-07 17:24:17 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
a60f7988b9 Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format. 
In the ha_partition::position() we don't calculate the number
of the partition of the record, but use m_last_part value instead,
relying on that it's previously set by some other call like ::write_row().
Delete_rows_log_event::do_exec_row() calls find_and_fetch_row(),
where we used position() + rnd_pos() call for the InnoDB-based PARTITION-ed
table as there HA_PRIMARY_KEY_REQUIRED_FOR_POSITION enabled.

fixed by introducing new handler::rnd_pos_by_record() method to be
used for random record-based positioning
 2007-09-07 18:41:49 +05:00
jperkin@production.mysql.com
ebb1d05402 Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27520 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
 2007-09-07 15:37:04 +02:00
jperkin@production.mysql.com
5133eeff45 Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27520 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/50/mysql-5.0
 2007-09-07 15:32:47 +02:00
tomas@whalegate.ndb.mysql.com
35bddfecf7 Bug #11313 confusing/erroneous 4006 message 2007-09-07 11:15:07 +02:00
kaa@polly.(none)
8da409ac16 This patch is a part of work on bug #5731 "key_buffer_size not properly restricted to 4GB". 
The patch limits read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms for the following reasons:
  
- I/O code in mysys, code in mf_iocache.c and in some storage engines do not currently work with sizes > 2 GB for those buffers
- even if the above had been fixed, Windows POSIX read() and write() calls are not 2GB-safe, so setting those buffer to sizes > 2GB would not work correctly on 64-bit Windows.
 2007-09-07 11:58:04 +04:00
malff@omega.weblab
1a13d76941 Test cleanup in rpl_binlog_grant: XID values are unpredictable 2007-09-06 12:06:22 -06:00
gshchepa/uchum@gleb.loc
d61cfb273f Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-06 22:42:44 +05:00
gshchepa/uchum@gleb.loc
1926819d5b Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-06 22:31:25 +05:00
gshchepa/uchum@gleb.loc
d330a49105 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-09-06 22:27:13 +05:00
gshchepa/uchum@gleb.loc
28ca0e8943 sql_parse.cc: 
Post-merge fix.
 2007-09-06 21:56:46 +05:00
davi@moksha.local
0187e78f40 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
 2007-09-06 13:28:00 -03:00
davi@moksha.local
4aaab47ea9 The test case for bug 28587 doesn't work with the embedded version, 
the first query is not running while we are doing wait queries on
a second connection.
 2007-09-06 13:22:34 -03:00
gshchepa/uchum@gleb.loc
adbe17c8a1 sp.result: 
Post-merge fix.
 2007-09-06 20:42:36 +05:00
gshchepa/uchum@gleb.loc
4732821e9d Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-06 19:15:31 +05:00