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

11584 commits

Author SHA1 Message Date
elliot@mysql.com
ac6450b858 BUG#19158 Fixing rpl_row_log_innodb test for pushbuild. 2006-04-18 00:30:55 -04:00
igor@rurik.mysql.com
e178ec2fc8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-17 16:40:16 -07:00
cmiller@zippy.(none)
61552172df Fixing a merge from a few days ago. 
Without a flush this test is nondeterministic for "row" binlog-format.
 2006-04-17 18:57:01 -04:00
pekka@mysql.com
9f355db66e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-04-18 00:56:59 +02:00
mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se
9c6aef5b4e BUG#18752 
Fixed forgotten merge fix
 2006-04-17 18:56:58 -04:00
cmiller@zippy.(none)
592dc88be7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
 2006-04-17 16:00:49 -04:00
pekka@mysql.com
4d1e38744d ndb - bug#16796 2006-04-17 20:24:41 +02:00
cmiller@zippy.(none)
809cb7521c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
 2006-04-17 10:14:38 -04:00
gkodinov@mysql.com
94e556137d BUG#17152: Wrong result with BINARY comparison on aliased column 
Testsuite added
 2006-04-17 16:46:56 +03:00
bar@mysql.com
3fef2ba6aa Merge mysql.com:/usr/home/bar/mysql-4.1.b18691 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-04-17 15:01:55 +05:00
brian@zim.(none)
98f2cd4468 Fixed a few pieces around support for data directory. 2006-04-16 21:55:02 -07:00
cmiller@zippy.(none)
7d282984f3 Only expand the empty string to the letters "NULL" if the column 
does not have "NOT NULL" attribute set.  Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to 
print MAXINT-n spaces.
 2006-04-16 17:17:36 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
8ae26a2868 WL 2826: Error handling of ALTER TABLE for partitioning 
After review changes
 2006-04-15 21:49:13 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
5dc6310712 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-15 09:47:33 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
d73e985ac1 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-14 17:50:32 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd868aecbb Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-14 17:48:27 -04:00
cmiller@zippy.(none)
c7513d482f Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-04-14 13:33:02 -04:00
cmiller@zippy.(none)
1d1040e1ea Hand-merged test. 2006-04-14 11:39:36 -04:00
cmiller@zippy.(none)
4671650387 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

(With hand-merged tests.)
 2006-04-14 11:38:09 -04:00
evgen@moonbone.local
bc1f457194 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14169-bug-4.1-mysql
 2006-04-14 17:25:58 +04:00
aelkin@mysql.com
b033da87fa Bug#19097: rpl_view failed on some platforms 
removing comments from the opt file.
 2006-04-14 12:13:26 +03:00
bar@mysql.com
e75d52711a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-14 13:57:46 +05:00
bar@mysql.com
ed6899c64f Merge mysql.com:/usr/home/bar/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-14 13:34:18 +05:00
jimw@mysql.com
6f5999e9b5 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-13 18:59:13 -07:00
bell@sanja.is.com.ua
5c7955bd54 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-14 02:02:28 +03:00
konstantin@mysql.com
b5863b3987 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-14 02:38:41 +04:00
bell@sanja.is.com.ua
8136b25811 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-14 00:17:50 +03:00
andrey@lmy004.
36b897f4c6 update 2006-04-13 23:26:02 +03:00
jimw@mysql.com
2396a360ca Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-13 13:22:44 -07:00
bell@sanja.is.com.ua
efb8b990e4 The check for recursive view definitions added. (BUG#14308) 2006-04-13 23:12:26 +03:00
konstantin@mysql.com
6f51b4199f Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-14 00:07:04 +04:00
jimw@mysql.com
515da4679b Don't remove mysql-test/std_data/*.pem in 'make clean' 2006-04-13 12:36:14 -07:00
mleich@mysql.com
9ee2a76be3 Merge three.local.lan:/home/matthias/Arbeit/mysql-4.1/src-1 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-13 21:09:26 +02:00
aelkin@dl145j.mysql.com
b6992dd4c5 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
 2006-04-13 20:55:51 +02:00
mleich@mysql.com
3ca1ec8fdc Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to 
MySQL 4.1
  and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
  - backport of several fixes done in MySQL 5.0 to 4.1
  - fix for new discovered instability (see comment on Bug#12429 + Bug#16920)
  - reenabling of testcases
 2006-04-13 20:42:48 +02:00
jimw@mysql.com
66c29e0f49 Merge mysql.com:/home/jimw/my/mysql-5.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
 2006-04-13 10:37:57 -07:00
jimw@mysql.com
55727ef6d0 Remove sql-bench from the server repository -- it is being maintained 
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
 2006-04-13 10:34:46 -07:00
aelkin@mysql.com
676bcecd25 Bug#19074: rpl_row_func003 test failed 
disabled for now.
 2006-04-13 19:02:49 +03:00
igor@rurik.mysql.com
dbd87b39c0 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-13 08:41:15 -07:00
serg@serg.mylan
3acc678101 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-04-13 15:34:39 +02:00
tomas@poseidon.ndb.mysql.com
6230cdd418 retested all disabled ndb tests in pushbuild for 5+ runs and updated disabled.def accordingly 2006-04-13 15:34:38 +02:00
tomas@poseidon.ndb.mysql.com
d878c904c2 BUG#18976 test workaround 2006-04-13 15:16:02 +02:00
bell@sanja.is.com.ua
cb81389aef Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-13 15:07:50 +03:00
sergefp@mysql.com
34b2ed5f7f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.0-csc9139
 2006-04-13 16:07:48 +04:00
sergefp@mysql.com
1d3a0c0ec8 BUG#19021, Crash in ROR-index_merge optimizer: 
get_best_covering_ror_intersect() was copying ror_scans starting from the 
end of the array and not from its beginning.
 2006-04-13 16:05:32 +04:00
tomas@poseidon.ndb.mysql.com
e24b750c23 disabled tests with accurate bug reports 2006-04-13 13:31:14 +02:00
ramil@mysql.com
2398882097 Fix for bug #18643: crazy UNCOMPRESS(). 2006-04-13 16:19:21 +05:00
tomas@poseidon.ndb.mysql.com
07753c59a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-13 10:48:24 +02:00
serg@serg.mylan
d65ccb4493 merged 2006-04-13 10:24:44 +02:00
bar@mysql.com
45293fc346 Bug#18691: Converting number to UNICODE string returns invalid result. 
Conversion from int and real numbers to UCS2 didn't work fine: 
CONVERT(100, CHAR(50) UNICODE)
CONVERT(103.9, CHAR(50) UNICODE)

The problem appeared because numbers have binary charset, so,
simple charset recast binary->ucs2 was performed
instead of real conversion.

Fixed to make numbers pretend to be non-binary.
 2006-04-13 10:55:48 +05:00