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
28774 commits 2793 branches 343 tags 1.5 GiB
Commit graph

28774 commits

This branch
This branch
All branches
Author SHA1 Message Date
pem@mysql.com
2d340a875c Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16568/mysql-5.0
 2006-02-06 14:09:14 +01:00
pekka@mysql.com
810cbaf157 ndb - testBlobs needs more tx in 5.0 ? 2006-02-05 23:06:08 +01:00
pekka@mysql.com
9ccda327a3 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-05 22:51:13 +01:00
pekka@mysql.com
8ed86030b4 ndb - bug#16693 (4.1) test + workaround, analyze later 2006-02-05 22:12:06 +01:00
pekka@mysql.com
4df873e547 Merge mysql.com:/space/pekka/ndb/version/my41 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-03 15:27:26 +01:00
pekka@mysql.com
c696582df4 ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ] 2006-02-03 15:23:58 +01:00
pekka@mysql.com
7b892368c3 ndb - bugfix: tinyblob + replace => mysqld crash (no bug#) 2006-02-03 14:35:29 +01:00
igor@rurik.mysql.com
66b6c988f5 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-03 00:07:57 -08:00
igor@rurik.mysql.com
7b58b91fe4 Fixes after manual merge 2006-02-02 23:56:08 -08:00
igor@rurik.mysql.com
f61517d60b Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 21:23:36 -08:00
igor@rurik.mysql.com
4abab51c24 Post-review fix for bug #14927. 2006-02-02 20:37:58 -08:00
igor@rurik.mysql.com
cc2fae5244 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-02-02 17:56:05 -08:00
igor@rurik.mysql.com
3f9bb37461 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-02-02 17:39:38 -08:00
konstantin@mysql.com
cb7118edcd One more post-merge fix. 2006-02-03 02:01:01 +03:00
igor@rurik.mysql.com
b32ce5ac79 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 13:47:21 -08:00
konstantin@mysql.com
303ad65fb2 Post-merge fixes. 2006-02-03 00:07:36 +03:00
konstantin@mysql.com
5678bc526e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-02-02 23:35:23 +03:00
gunnar@mysql.com.
17fe251201 item_timefunc.cc: 
manual adding the fix for bug#15828 which did not automerge
 2006-02-02 21:27:23 +01:00
gunnar@mysql.com.
b413d72850 Merge mysql.com.:/data/BK/mysql-4.1_15828 
into  mysql.com.:/data/BK/mysql-5.0_15828
 2006-02-02 19:10:27 +01:00
konstantin@mysql.com
98091b152a Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-02-02 18:17:18 +03:00
msvensson@neptunus.(none)
c9b7317ff9 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-02 11:47:01 +01:00
msvensson@neptunus.(none)
01ddf96930 Convert exponent results for MYSQL_TYPE_FLOAT on Windows 2006-02-02 11:45:37 +01:00
msvensson@neptunus.(none)
264640c532 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-02 08:23:24 +01:00
igor@rurik.mysql.com
86606615ab Fixed bug #16382. 
When an ambiguous field name is used in a group by clause a warning is issued
in the find_order_in_list function by a call to push_warning_printf.
An expression that was not always valid was passed to this call as the field
name parameter.
 2006-02-01 20:43:43 -08:00
andrey@lmy004.
736faf4730 fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset) 2006-02-01 20:35:16 +01:00
pem@mysql.com
526a974460 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15011/mysql-5.0
 2006-02-01 16:01:22 +01:00
pem@mysql.com
30d1426675 Post-review fix for BUG#15011. 
Added comments.
 2006-02-01 16:00:11 +01:00
msvensson@neptunus.(none)
df5a947ba7 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-01 15:02:36 +01:00
pem@mysql.com
a84c7e1c29 Added new test case for BUG#14533: 'desc tbl' in stored procedure causes error 1142 
which is no longer repeatable. (Unclear when this was fixed.)
 2006-02-01 14:46:30 +01:00
pem@mysql.com
d37570daf4 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/cantrepeat/mysql-5.0
 2006-02-01 12:31:48 +01:00
msvensson@neptunus.(none)
102aa5a79f Use common function 'append_field' to output the value of one field to the result. 
Fix for extra zero in exponent of double values on windows.
 2006-02-01 11:36:32 +01:00
igor@rurik.mysql.com
d6370b48a7 FIxed bug #14927. 
A query with a group by and having clauses could return a wrong
result set if the having condition contained a constant conjunct 
evaluated to FALSE.
It happened because the pushdown condition for table with
grouping columns lost its constant conjuncts.
Pushdown conditions are always built by the function make_cond_for_table
that ignores constant conjuncts. This is apparently not correct when
constant false conjuncts are present.
 2006-01-31 21:48:32 -08:00
aivanov@mysql.com
bba8155516 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss162
 2006-01-31 21:49:20 +03:00
aivanov@mysql.com
9296fb241d Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582. 
Applied innodb-5.0-ss149/162 snapshots.
 2006-01-31 21:41:48 +03:00
msvensson@devsrv-b.mysql.com
04d6b7fa54 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my41-bug15302 
into  devsrv-b.mysql.com:/space/magnus/my41-bug15302
 2006-01-31 18:51:15 +01:00
pem@mysql.com
b3ebd755cc Added test case for BUG#15091: Sp Returns Unknown error in order clause....and there is 
no order by clause
which was fixed by earlier changesets.
The error message is now the more generic "Unknown table ... in field list".
 2006-01-31 17:00:50 +01:00
msvensson@devsrv-b.mysql.com
e899ab07c2 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/my50-bug15302
 2006-01-31 16:42:25 +01:00
pem@mysql.com
af11dc3cbe Added test case for BUG#14270: Stored procedures: crash if load index 
which was fixed by earlier changesets; LOAD INDEX is not allowed in functions.
  Also testing CACHE INDEX, while OPTIMIZE and CHECK were covered by existing tests already.
 2006-01-31 16:27:57 +01:00
knielsen@mysql.com
a6b86d8962 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-01-31 16:24:25 +01:00
msvensson@devsrv-b.mysql.com
b844f62614 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my50-bug15302 
into  devsrv-b.mysql.com:/space/magnus/my50-bug15302
 2006-01-31 15:14:46 +01:00
dlenev@mysql.com
7715538018 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
 2006-01-31 15:51:55 +03:00
msvensson@neptunus.(none)
ba81b1dd52 Merge neptunus.(none):/home/msvensson/mysql/bug15302/my41-bug15302 
into  neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302
 2006-01-31 12:52:25 +01:00
pem@mysql.com
e2360cf745 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
 2006-01-31 12:47:36 +01:00
msvensson@neptunus.(none)
b758b690a1 Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1) 
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
 - Change mysqltest to detect when there aren't as many warnings available as was reported.
 2006-01-31 12:47:22 +01:00
dlenev@mysql.com
a25ca5fa63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
 2006-01-31 14:43:41 +03:00
msvensson@neptunus.(none)
10036d354c Check std_data_ln already created 
Add / to std_data in ln command
 2006-01-31 10:48:40 +01:00
pem@mysql.com
c9476999ef Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
 2006-01-31 09:49:54 +01:00
msvensson@neptunus.(none)
6b136726b3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-31 09:39:51 +01:00
msvensson@neptunus.(none)
a71de6bfe2 Bug #16919 some tests fail in 5.0 
- Use "../tmp" as --slave-load-tmpdir. Same as in mysql-test-run.pl
 2006-01-31 09:38:40 +01:00
knielsen@mysql.com
a002d316ed Fix missing --replace_result on $SLAVE_MYPORT in federated. 2006-01-31 09:15:28 +01:00