sasha@asksasha.com
cb6d69f6f4
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-15 13:38:48 -07:00
sasha@asksasha.com
9986a357ec
merged in the test case for BUG#7947
2005-11-15 13:38:06 -07:00
bell@sanja.is.com.ua
13ae8d8d70
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-11-15 22:08:17 +02:00
evgen@moonbone.local
3a8e7b7fb9
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14850-bug-5.0-mysql
2005-11-15 22:47:03 +03:00
bell@sanja.is.com.ua
a2b8128398
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-11-15 19:22:00 +02:00
ingo@mysql.com
6bc4636b64
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-11-15 18:09:40 +01:00
ingo@mysql.com
aa1f46a819
Bug#14616 - Freshly imported table returns error 124 when using LIMIT
...
After merge fix.
2005-11-15 18:01:30 +01:00
bell@sanja.is.com.ua
297639bdbe
Test suite for BUG#13673 (the bug was fixed in the bugfix for BUG#14138)
2005-11-15 18:14:53 +02:00
ingo@mysql.com
1aa15c25c7
Merge mysql.com:/home/mydev/mysql-4.0-bug14397
...
into mysql.com:/home/mydev/mysql-4.0-4000
2005-11-15 16:47:15 +01:00
ingo@mysql.com
8996fd40cf
Merge mysql.com:/home/mydev/mysql-4.0-bug14616
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-11-15 16:07:05 +01:00
pem@mysql.com
15df2c2298
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14723/mysql-5.0
2005-11-15 13:27:00 +01:00
andrey@lmy004.
5ce732dcfe
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bdb_region
2005-11-15 12:38:22 +01:00
kent@mysql.com
d017ef511a
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-15 11:05:15 +01:00
evgen@moonbone.local
35f7b50b18
Fix bug #14816 test_if_order_by_key() expected only Item_fields.
...
test_if_order_by_key() expected only Item_fields to be in order->item, thus
failing to find available index on view's field, which results in reported
error.
Now test_if_order_by_key() calls order->item->real_item() to get field for
choosing index.
2005-11-14 22:10:34 +03:00
ingo@mysql.com
88b6d28aba
Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
...
After push fix. Must not access new_field if it is NULL.
2005-11-14 19:53:41 +01:00
evgen@moonbone.local
70e1974f76
Fix bug #14850 Item_ref's null_value wasn't updated
...
Item_ref's null_value wasn't updated in save_org_in_field() causing reported
error.
2005-11-14 21:52:39 +03:00
SergeyV@selena.
a035c96c0f
Import patch for bug #13377 from current 5.0 bk tree.
2005-11-14 18:10:16 +03:00
SergeyV@selena.
43bbd352e3
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#14569-mysql-5.0
2005-11-14 17:42:14 +03:00
pem@mysql.com
b614c82b10
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14723/mysql-5.0
2005-11-14 15:18:05 +01:00
kent@mysql.com
f189de5170
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-14 15:15:43 +01:00
SergeyV@selena.
5583e98498
Added workaround for rpl_frop_db test to run on win32 properly.
2005-11-14 16:39:46 +03:00
SergeyV@selena.
be18f91a01
Added number of files into ignore list for win32 build within bk tree.
2005-11-14 16:36:05 +03:00
SergeyV@selena.
450909f0d3
Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel
...
into selena.:H:/MYSQL/bkt/mysql-5.0
2005-11-14 16:16:29 +03:00
SergeyV@selena.
00990f9774
Fixes bug #13377 . my_open() & my_create() functions changed to use
...
my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to
allow deleting opened files. my_sopen() implementation is added to
support this functionality.
2005-11-14 16:01:10 +03:00
SergeyV@selena.
95e0c72eb2
Fixed number of compiler errors on win32.
2005-11-14 15:19:52 +03:00
pekka@mysql.com
5a6a844fb7
ndb - wl#1497 add LinearPool
2005-11-14 12:03:23 +01:00
kent@mysql.com
7966c4ddac
config-win.h:
...
Disabled yaSSL support for now
2005-11-14 04:07:24 +02:00
kent@mysql.com
a717f7bf98
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-11-14 02:08:17 +02:00
kent@mysql.com
61438b0218
mysql-test-run.pl:
...
Corrected search for 'mysqlimport' executable
2005-11-14 01:59:15 +02:00
kent@mysql.com
6c2017e0c0
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-12 15:11:21 +02:00
andrey@lmy004.
6f8d80b146
2 More --bdb variables (fix for bug #14895 )
...
- added bdb-cache-parts
- modified bdb-cache-size to support more than 4G
- added bdb-region-size (size of memory pool for storing file names used in transaction)
2005-11-12 11:56:16 +01:00
svoj@mysql.com
5d8cefe0b4
Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8
2005-11-12 11:25:14 +04:00
pekka@mysql.com
f2f239b5ee
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release
...
into mysql.com:/space/pekka/ndb/version/my51-rel
2005-11-12 05:14:23 +01:00
jimw@mysql.com
11669921ce
Support full list of BDB deadlock detection methods. (Bug #14876 )
2005-11-11 16:36:26 -08:00
jimw@mysql.com
2ffc7ff2a2
Update out-of-date URLs in 'help' text of mysql client. (Bug #14801 )
2005-11-11 15:23:04 -08:00
joerg@mysql.com
9f065041fc
Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
2005-11-11 22:18:41 +01:00
jimw@mysql.com
eeaecbc2bd
Sync suggestions for bdb_cache_size in my-medium.cnf and my-huge.cnf to
...
be the same as the suggested innodb_buffer_pool_size.
2005-11-11 11:41:23 -08:00
SergeyV@selena.
dbb29d11ee
Fixes bug #14569 . When no db is selected as current and we do create procedure db.sp()...
...
we changing current db temporarily and restore it when sp is created. however thd->db
in this case becomes empty string rather than NULL and so all checks of thd->db == NULL
will be false. So if after this we'll issue create procedure sp2()... without specifying
db it will succeed and create sp with db=NULL, which causes mysqldto crash on
show procedure status statement.
This patch fixes the problem.
2005-11-11 21:01:48 +03:00
joerg@mysql.com
bc964a379a
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release
...
into mysql.com:/M51/clone-5.1
2005-11-11 18:51:22 +01:00
joerg@mysql.com
ebb6552b1c
scripts/make_binary_distribution.sh
...
Adapt to the directory hierarchy change in 5.1, "ndb" -> "storage/ndb".
2005-11-11 18:48:53 +01:00
pem@mysql.com
b607fdb04d
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14723/mysql-5.0
2005-11-11 18:12:40 +01:00
evgen@moonbone.local
508824f7c4
Fix bug #13622 Wrong view .frm created if some field's alias contain \n
...
View .frm parser assumes that query string will take only 1 line, with \n in
aliases query stringmay take several lines thus produces bad .frm file.
'query' parameter type changed from 'string' to 'escaped string'
2005-11-11 20:03:32 +03:00
SergeyV@selena.
d2042caca6
Fixes bug #14569 . In addition to check current db of not being NULL value
...
it is added a check of not being empty value. When modifying SP with Admin
application on win32 it does not pass curent database so sp is stored with
db=null which causes a crash later on show procedure status;
2005-11-11 19:06:18 +03:00
pekka@mysql.com
e98fad6bcb
ndb - 5.1.2 build fix: Signal syms in test pgms on hp3750
2005-11-11 12:47:10 +01:00
georg@lmy002.wdf.sap.corp
5896aa5179
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.1
2005-11-11 11:40:48 +01:00
pekka@mysql.com
bffe8fb29d
ndb - 5.1.2 build fix: array initializer crashes gcc-2.95.3
2005-11-11 11:36:00 +01:00
georg@lmy002.wdf.sap.corp
e232848647
removed old sap build files
2005-11-11 11:20:48 +01:00
pem@mysql.com
7d134961df
Fixed BUG#14723: Dumping of stored functions seems to cause corruption
...
in the function body
Changed the way the end of query was found from the lex state.
The routine body was not extracted correctly when using the
/*!version ... */ wrapper (in dump files); for some types of routines
(e.g. with a label at the first begin), the trailing "*/" was not skipped.
2005-11-11 11:10:52 +01:00
timour@mysql.com
13260ea8f3
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-14662
2005-11-11 12:10:19 +02:00
andrey@lmy004.
bc684697a6
unneeded files
2005-11-11 10:54:01 +01:00