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

29737 commits

This branch
This branch
All branches
Author SHA1 Message Date
mleich@mysql.com
e8178cabb1 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-20 12:35:10 +02:00
evgen@moonbone.local
e347ec5cbe func_gconcat.result, func_gconcat.test: 
Remove duplicate test case for bug#14169
 2006-04-20 13:34:14 +04:00
igor@rurik.mysql.com
692da27388 Post merge fix 2006-04-20 00:42:12 -07:00
igor@rurik.mysql.com
7b0373a557 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:27:18 -07:00
igor@rurik.mysql.com
27cc6f4bc3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:08:15 -07:00
igor@rurik.mysql.com
67458961cf Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol. 2006-04-19 16:08:37 -07:00
igor@rurik.mysql.com
881b55d503 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-2
 2006-04-19 14:42:51 -07:00
jimw@mysql.com
b57eb9e17c Merge mysql.com:/home/jimw/my/mysql-5.0-17043 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-19 14:18:35 -07:00
evgen@moonbone.local
f89daa2f6d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14169-bug-4.1-mysql
 2006-04-20 00:28:17 +04:00
evgen@moonbone.local
8b4eae6e4f func_gconcat.result: 
Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.
 2006-04-20 00:27:43 +04:00
svoj@april.(none)
806cd41529 Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption 
After a locking error the open table(s) were not fully
cleaned up for reuse. But they were put into the open table
cache even before the lock was tried. The next statement
reused the table(s) with a wrong lock type set up. This
tricked MyISAM into believing that it don't need to update
the table statistics. Hence CHECK TABLE reported a mismatch
of record count and table size.

Fortunately nothing worse has been detected yet. The effect
of the test case was that the insert worked on a read locked
table. (!)

I added a new function that clears the lock type from all
tables that were prepared for a lock. I call this function
when a lock failes.

No test case. One test would add 50 seconds to the
test suite. Another test requires file mode modifications.
I added a test script to the bug report. It contains three
cases for failing locks. All could reproduce a table
corruption. All are fixed by this patch.

This bug was not lock timeout specific.
 2006-04-19 22:54:25 +05:00
stewart@mysql.com
1626a76fdc Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge
 2006-04-19 17:14:35 +10:00
igor@rurik.mysql.com
950214abfc Fixed bug #19079. 
The bug caused a reported index corruption in the cases when
key_cache_block_size was not a multiple of myisam_block_size,
e.g. when key_cache_block_size=1536 while myisam_block_size=1024.
 2006-04-18 20:57:31 -07:00
mleich@mysql.com
d548dd4e37 Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src 
into  mysql.com:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-18 13:43:52 +02:00
stewart@mysql.com
ea349616b1 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18881 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge
 2006-04-18 17:39:05 +10:00
stewart@mysql.com
40ec77d05e Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18843 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/merge
 2006-04-18 17:22:25 +10:00
stewart@mysql.com
4e092ed74f Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18833 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/merge
 2006-04-18 17:21:54 +10: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
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
a9e3092102 item_timefunc.cc: 
5.0 additional fix for b#18691
  Handle DECIMAL the same with INT and REAL.
 2006-04-17 15:36:25 +05: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
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
svoj@april.(none)
8a7adb196d Merge april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-5.0
 2006-04-15 16:08:03 +05: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
941e529c59 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b18691
 2006-04-14 13:30:47 +05: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
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
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
bell@sanja.is.com.ua
df69944e73 postmerge fix: added tinfo support. 2006-04-13 16:06:52 +03:00
bell@sanja.is.com.ua
014914cbcf 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-13 16:01:08 +03: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
grog@mysql.com
da6210ee61 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/MySQL/5.0-Bug-17248a
 2006-04-13 21:37:49 +09:30
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
svoj@april.(none)
d1969bcfe0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
 2006-04-13 15:40:12 +05:00
konstantin@mysql.com
b915f054cf Fix a typo in the help message. 2006-04-13 14:06:46 +04:00
svoj@april.(none)
f78fdf6621 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
 2006-04-13 14:38:36 +05:00
svoj@april.(none)
7412db5e56 BUG#17917 - SELECT from compressed MyISAM table crashes MySQL server 
Retrieving data from compressed MyISAM table which is bigger than 4G on 32-bit box
with mmap() support results in server crash.

mmap() accepts length of bytes to be mapped in second param, which is 32-bit
size_t. But we pass data_file_length, which is 64-bit my_off_t. As a result only
first data_file_length % 4G were mapped.

This fix adds additional condition for mmap() usage, that is use mmap() for
compressed table which size is no more than 4G on 32-bit platform.
 2006-04-13 14:37:03 +05:00
grog@mysql.com[grog]
3eb783813f foo2 2006-04-13 17:22:56 +09:30
grog@mysql.com[grog]
b2cd3a963a foo1 2006-04-13 17:20:33 +09:30
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
igor@rurik.mysql.com
316eeff690 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-12 16:14:20 -07:00
konstantin@mysql.com
c49e6f8869 Post-merge fixes. Add a new error message for max_prepared_stmt_count 
limit.
 2006-04-13 01:46:44 +04:00