bell@sanja.is.com.ua
3d2d9c2259
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
2005-12-03 08:56:00 +02:00
jimw@mysql.com
52bb91cceb
Merge mysql.com:/home/jimw/my/mysql-5.1-14655
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-02 16:11:04 -08:00
evgen@moonbone.local
2ac237bc2e
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into moonbone.local:/work/15028-bug-5.1-new-mysql
2005-12-03 00:53:25 +03:00
evgen@moonbone.local
e3103ad5d9
disabled.def:
...
Failing tests func_group func_math group_min_max are disabled
2005-12-03 00:52:41 +03:00
bell@sanja.is.com.ua
58c581ab62
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 22:59:29 +02:00
vtkachenko@quadxeon.mysql.com
c990ffdc08
Merge bk-internal:/home/bk/mysql-5.1-new
...
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new1
2005-12-02 21:19:13 +01:00
vtkachenko@quadxeon.mysql.com
06df985963
mysqld.cc:
...
Fix help message
2005-12-02 21:17:40 +01:00
konstantin@mysql.com
6f63650d72
Add a test case for Bug#5967 "Stored procedure declared variable
...
used instead of column", the bug is to be fixed later.
2005-12-02 22:43:56 +03:00
bell@sanja.is.com.ua
b1f0e78146
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 21:20:25 +02:00
bell@sanja.is.com.ua
45e59f3d76
Now we shall store only position (index of first character)
...
of SELECT from query begining, to be independet of query buffer
allocation.
Correct procedure used to find beginning of the current statement
during parsing (BUG#14885).
2005-12-02 21:18:12 +02:00
evgen@moonbone.local
f2559fbcc3
Merge moonbone.local:/work/15028-bug-5.0-mysql
...
into moonbone.local:/work/15028-bug-5.1-new-mysql
2005-12-02 22:07:10 +03:00
evgen@moonbone.local
70abb812fb
sql_cache.cc:
...
After merge fix
2005-12-02 22:04:22 +03:00
bell@sanja.is.com.ua
54b7e6e3dc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 20:50:54 +02:00
evgen@moonbone.local
b7d7f78fd0
query_cache.result:
...
After merge fix
2005-12-02 21:05:23 +03:00
pem@mysql.com
e7a7af07b2
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-02 18:43:08 +01:00
evgen@moonbone.local
00b902b065
Manually merged
2005-12-02 19:42:14 +03:00
evgen@moonbone.local
151350536c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/15028-bug-4.1-mysql
2005-12-02 18:42:05 +03:00
pem@mysql.com
035c24beeb
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14376/mysql-5.0
2005-12-02 15:04:50 +01:00
pem@mysql.com
ed6e09a38c
Post-review fixes for BUG#14376: MySQL crash on scoped variable (re)initialization
2005-12-02 14:30:42 +01:00
bell@sanja.is.com.ua
68a20f3ef7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 14:00:12 +02:00
vtkachenko@quadxeon.mysql.com
c1854e67f0
Merge bk-internal:/home/bk/mysql-5.1-new
...
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
2005-12-02 12:02:38 +01:00
gluh@eagle.intranet.mysql.r18.ru
e9d70e4b97
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
...
-issue more correct message for incorrect date|datetime|time values
-ER_WARN_DATA_OUT_OF_RANGE message is changed
-added new error message
2005-12-02 15:01:44 +04:00
vtkachenko@quadxeon.mysql.com
9149eea9a5
Merge
2005-12-02 11:53:01 +01:00
stewart@mysql.com
00d95a8bea
BUG#15425 Small window for NF during backup failing without error
2005-12-02 09:27:06 +01:00
ramil@mysql.com
681252c82d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b12956
2005-12-02 11:57:26 +04:00
bell@sanja.is.com.ua
c98fbc0320
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 08:43:05 +02:00
elliot@mysql.com
36c45752e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/users/emurphy/src/mysql-5.1-new
2005-12-02 06:16:24 +01:00
elliot@mysql.com
66a5dfa62f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/users/emurphy/src/mysql-5.1-new
2005-12-02 01:23:26 +01:00
elliot@mysql.com
36936ecd64
BUG#15406: Adding support for transactions to blackhole.
...
Now when rolling back a transaction on a blackhole table,
the transaction will not be written to the binlog.
2005-12-02 01:11:49 +01:00
jimw@mysql.com
01ac5172dd
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-01 15:14:51 -08:00
jimw@mysql.com
3d223afb28
Post-merge result file cleanup
2005-12-01 15:10:35 -08:00
SergeyV@selena.
29941c07ed
Merge selena.:H:/MYSQL/bkt/mysql-5.0
...
into selena.:H:/MYSQL/bkt/mysql-5.1
2005-12-01 23:47:44 +03:00
evgen@moonbone.local
3f72e7645f
Fix bug#15028 Multitable update returns different numbers of matched rows
...
depending on table order
multi_update::send_data() was counting updates, not updated rows. Thus if one
record have several updates it will be counted several times in 'rows matched'
but updated only once.
multi_update::send_data() now counts only unique rows.
2005-12-01 23:22:20 +03:00
jimw@mysql.com
beed6147ad
Merge mysql.com:/home/jimw/my/mysql-4.1-13318
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-01 12:21:29 -08:00
jimw@mysql.com
fb1200a0a3
Merge mysql.com:/home/jimw/my/mysql-4.1-12612
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-01 12:07:25 -08:00
jimw@mysql.com
e7fe779ddf
Merge mysql.com:/home/jimw/my/mysql-5.0-keysize
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-01 12:03:46 -08:00
jimw@mysql.com
e86048ce59
Enable key lengths of up to 3K on 32-bit platforms.
2005-12-01 11:11:03 -08:00
SergeyV@selena.
22b43351f8
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#14902-mysql-5.0
2005-12-01 20:29:48 +03:00
bell@sanja.is.com.ua
ac26e14e99
postmerge fix
2005-12-01 17:13:54 +02:00
bell@sanja.is.com.ua
8cbf1e5119
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 17:12:42 +02:00
timour@mysql.com
27e962764d
Merge mysql.com:/home/timka/mysql/src/5.1-virgin
...
into mysql.com:/home/timka/mysql/src/5.1-dbg
2005-12-01 14:47:02 +02:00
bell@sanja.is.com.ua
7796a79477
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 14:38:29 +02:00
vtkachenko@quadxeon.mysql.com
045747f23d
Many files:
...
Added mmap support for MyISAM engine
2005-12-01 13:34:48 +01:00
bell@sanja.is.com.ua
e3f2a63308
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 14:29:12 +02:00
bell@sanja.is.com.ua
12d1bf1231
We should skip beggining '(' characters when test query on possibility
...
to be in the query cache. (BUG#14652)
2005-12-01 14:26:19 +02:00
gluh@eagle.intranet.mysql.r18.ru
21cc3ae561
Fix for bug#11491 Misleading error message if not NULL column set to NULL,
...
SQL mode TRADITIONAL
Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'
2005-12-01 15:30:11 +04:00
ramil@mysql.com
ab04ceafc7
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-12-01 14:31:28 +04:00
ramil@mysql.com
37cfade0b4
Fix for bug #14304 : auto_increment field incorrect set from within stored procedure (insert select).
2005-12-01 14:26:46 +04:00
bell@sanja.is.com.ua
2c666b32db
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 12:16:45 +02:00
bell@sanja.is.com.ua
2ff98e0586
View creation code fixed to expect empty TABLE_LIST::table pointer (BUG#15096).
2005-12-01 12:15:48 +02:00