mskold@mysql.com
cf87b5b096
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-07-19 09:09:40 +02:00
bell@sanja.is.com.ua
5eadafe569
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
2004-07-17 02:13:02 +03:00
bell@sanja.is.com.ua
e3791c3dbf
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-17 01:08:25 +03:00
bell@sanja.is.com.ua
b6a23bab45
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
2004-07-16 15:47:28 +03:00
bell@sanja.is.com.ua
67de5c37ff
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-16 15:45:06 +03:00
serg@serg.mylan
2c8737035c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-16 13:33:57 +02:00
serg@serg.mylan
0452d59d22
in 4.1 DATABASE() may be NULL
2004-07-16 13:21:58 +02:00
bell@sanja.is.com.ua
3609ab683e
stack overflow check added for subqueries processing (BUG#4554)
2004-07-14 23:57:14 +03:00
guilhem@mysql.com
9b93534c2f
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-07-13 16:51:59 +02:00
guilhem@mysql.com
a009af5e84
WL#1900 "When CHECK TABLE or ANALYZE TABLE of a MyISAM table is killed
...
by KILL or shutdown, do not mark the table as corrupted".
It is indeed more logical to leave the corruption flag unchanged.
This cannot be extended to REPAIR/OPTIMIZE as they make no backup copy
of the MYI. This patch was tested with KILL and mysqladmin shutdown
while a CHECK TABLE was running. Without the patch, the table becomes
unusable (can't INSERT to it, error 145). With the patch, no.
2004-07-13 16:51:10 +02:00
monty@mysql.com
79b3b220be
Don't close already closed files in vio (not critical)
2004-07-12 07:38:46 +03:00
monty@mysql.com
56d5e56cc6
Merge
2004-07-11 12:16:25 +03:00
dlenev@brandersnatch.localdomain
f214e2a02a
Reorder variables to preserve alphabetical sorting.
2004-07-10 15:21:44 +04:00
serg@serg.mylan
d6f601c80f
mysql_find_files() made extern (from static to sql_show.cc)
2004-07-10 11:13:05 +02:00
vva@eagle.mysql.r18.ru
34857ee664
manual merge
...
charged sql/sql_db.cc only
(
changed length in mysql_create_db to path_len
so as it was calculated in the first unpack_dirname
in my previous fix for Bug #4378
'"create database IF NOT EXISTS thing" returns an error'
)
2004-07-09 21:06:32 +05:00
vva@eagle.mysql.r18.ru
6782982254
added an optimization in mysql_create_db (sql_db.cc)
...
as after effect of fix for Bug #4378
'"create database IF NOT EXISTS thing" returns an error'
(avoided an unpack_dirname and
changed strcat into strmake)
2004-07-09 20:39:50 +05:00
mskold@mysql.com
bddd075d73
Fixed bug #4106 and removed buggy pk update
2004-07-09 13:18:56 +02:00
monty@mysql.com
c1032fe9eb
Cleanup of db option cacheing
...
Some bug fixes to last pushed code
2004-07-09 10:55:16 +03:00
monty@mysql.com
064b8b8f65
Merge with 4.0 to get bug fixes
2004-07-09 02:29:28 +03:00
vva@eagle.mysql.r18.ru
051a5461cc
fixed Bug #4378 "create database IF NOT EXISTS thing" returns an error
2004-07-08 21:25:17 +05:00
monty@mysql.com
949de54454
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-07-08 15:45:56 +03:00
monty@mysql.com
db7efa2780
New handler::index_flags() definition to make it easy to check the full used key and a specific key part.
...
Added key part to optimize_range() to fix problems when using fields in key parts.
2004-07-08 15:45:25 +03:00
bell@sanja.is.com.ua
a0ae383cbf
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work2-4.1
2004-07-08 13:18:57 +03:00
bar@mysql.com
a5025f4ca6
WL#807 Optimize loading database options in load_db_opt
...
also known as
BUG#2326 Charset of table is determined by charset of db only if "USE db;"
2004-07-08 15:03:01 +05:00
serg@serg.mylan
d0f53f7ee0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-07 23:51:25 +02:00
serg@serg.mylan
fe57b75079
bug#4441 - crash in UNHEX(NULL)
2004-07-07 23:49:03 +02:00
bar@mysql.com
6fdafa5635
Don't allow badly formed UTF8 identitiers
2004-07-07 16:39:43 +05:00
bar@mysql.com
d54157f0d8
ha_archive.cc:
...
Memory was used after it has been alreay freed.
This led to server crash on FreeBSD.
2004-07-07 13:47:29 +05:00
joreland@mysql.com
8db262f085
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-07-06 17:50:54 +02:00
joreland@mysql.com
ee3aca091b
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-07-06 17:47:56 +02:00
antony@ltantony.rdg.cyberkinetica.com
ac6e6c121f
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ltantony.rdg.cyberkinetica.com:/usr/home/antony/work/bug4407.1
2004-07-06 16:43:39 +01:00
antony@ltantony.rdg.cyberkinetica.com
58cec1fd6a
Bug#4407 - assertion in ha_myisam.cc
...
Fix assertion failure where ha_myisam::index_next() is called
without first calling ha_myisam::ha_index_init()
2004-07-06 16:30:50 +01:00
serg@serg.mylan
d8dabe43fb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 16:30:04 +02:00
bar@mysql.com
30a86a0be9
Bug#4417 binary character set breaks multi-byte table/field name.
2004-07-06 17:15:43 +05:00
serg@serg.mylan
c2295f163f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 14:05:41 +02:00
joreland@mysql.com
27fc980e79
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-07-06 10:20:52 +02:00
joreland@mysql.com
c61d23e0e5
merge
2004-07-06 08:56:05 +02:00
ndbdev@ndbmaster.mysql.com
2f24eec4d2
missing ;
2004-07-06 08:43:57 +02:00
joreland@mysql.com
2a8ea3861c
Fixed bugs in ordered scan discovered by mysql-test-run
...
Enabled ordered scan in handler
2004-07-05 20:41:06 +02:00
bell@sanja.is.com.ua
41bd6aa4b6
do not assign values of left expression of IN/ANN/ANY subquery in case of PS preparation (BUG#4403)
2004-07-04 10:40:24 +03:00
bell@sanja.is.com.ua
130740248b
aggregate functions check during substitution made only for single row subselects (BUG#4400)
...
restoring current senect pointer before PS rexecution (backport from 5.0)
removed spaces at lines ends
2004-07-04 08:46:28 +03:00
paul@ice.snake.net
fb7f15188a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-07-02 17:32:47 -05:00
paul@ice.snake.net
8ead38a5dc
item_geofunc.cc:
...
Minor comment tweaks.
2004-07-02 16:22:46 -05:00
mskold@mysql.com
3f20e69c25
Fixed ndbcluster_print_error to use table name from failed NdbOperation
2004-07-02 16:14:08 +02:00
bar@mysql.com
4df5a14a6f
Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection
2004-07-02 16:52:02 +05:00
mskold@mysql.com
c708619d0b
Added support for update of pk
2004-07-02 11:50:28 +02:00
bar@mysql.com
b41e009b04
armscii8_bin was referenced to as armscii_bin in a mistake.
2004-07-02 13:27:46 +05:00
guilhem@mysql.com
01dc75dfef
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-06-30 16:16:57 +02:00
guilhem@mysql.com
74809f7445
Fix for BUG#4326 "Replicated LOAD DATA INFILE show nothing in
...
processlist on slave":
we now report in SHOW PROCESSLIST that we are writing to the temp
files or loading the table. When we are writing to the tmp file:
| 3 | system user | | | Connect | 6 | Making temp file /tmp/SQL_LOAD-2-1-2.data |
and when we are actually loading the .data temp file into the table:
| 3 | system user | | test | Connect | 2 | | LOAD DATA INFILE '/tmp/SQL_LOAD-2-1-2.data' INTO TABLE `t` <...> |
2004-06-30 15:41:35 +02:00
serg@serg.mylan
648a2fea15
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-30 11:26:49 +02:00