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
c87812d8e6
Added comments to the PS test files, to prevent modifications which may destroy the tests .
2004-07-02 20:01:34 +02:00
4df5a14a6f
Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection
2004-07-02 16:52:02 +05:00
c708619d0b
Added support for update of pk
2004-07-02 11:50:28 +02:00
8462b8aeb8
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
2004-07-01 16:35:52 +02:00
7071d062c9
WL#1564 Intensive test of prepared statements via 'mysqltest'
2004-07-01 16:30:29 +02:00
78c1938848
Portability fixes (For Netware)
2004-07-01 17:26:45 +03:00
eb67909bf4
WL#1600 (Warn if result is truncatet due to max_allowed_packet)
2004-06-29 19:55:13 +05:00
6acd105b16
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4089
2004-06-29 13:51:35 +05:00
c0c1c3200a
a fix (bug #4304 : TRUNCATE <table of type BDB> , wrong result).
2004-06-29 13:49:50 +05:00
dddcc371fd
small bug fix
2004-06-28 20:02:16 +00:00
37df5deb41
adopting mysql-test-run to new ndb config
...
+ added option to ndb_waiter to wait for NO CONTACT
2004-06-28 19:53:55 +00:00
1860613ce1
Merge
2004-06-28 18:27:31 +00:00
11bd3eedfe
updated mysql-test/ndb to make use of new default config options
2004-06-28 18:22:39 +00:00
e228547a61
s/\r\n/\n/ in mysql-test/*/system_mysql_db*
...
according to http://www.bitkeeper.com/Documentation.FAQS.Windows_NT.html
2004-06-28 15:53:49 +05:00
a99468259b
after merge fix
2004-06-28 11:06:22 +02:00
146d68871b
Merged
2004-06-27 16:56:52 +02:00
cb188a89c1
after merge fix
2004-06-27 13:16:19 +02:00
f941f842c3
make lowercase_table3 to work
2004-06-27 11:57:08 +02:00
3236093b8b
removed using lex->select_lex.options is SHOW TABLE [STATUS] commands (BUG#4288)
2004-06-27 00:34:05 +02:00
a5c8b3ee59
correct eq() method for Item_param (BUG#4233)
2004-06-26 23:55:38 +02:00
450e5b0119
after merge fixed
2004-06-26 14:21:32 +02:00
172ab0ab8b
Fix for 'make dist' 'make distclean' goals work even if ./configure
...
called without NDB enabled.
2004-06-25 23:21:14 +04:00
8c867328cd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-25 21:56:42 +03:00
b1d08ba2b4
Merge with 4.0 to get the latest bug patches to 4.1
2004-06-25 20:13:05 +03:00
45411ca0b5
merge
2004-06-25 18:33:31 +03:00
3ba6fd97b4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 15:12:51 +02:00
3b59dd1bd0
bug#4008 - merge table cannot determine what key caused "dupl. key" error
2004-06-25 15:12:13 +02:00
8db6c064df
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2686
2004-06-25 14:44:37 +02:00
74b01ca387
type of parameter assignment for parameters from variables added (BUG#4280)
2004-06-25 15:16:00 +03:00
6e1eb6a78c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
2004-06-25 14:48:15 +03:00
57da928039
Merge
2004-06-25 12:59:47 +02:00
958cf857a3
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug3565
2004-06-25 12:14:54 +02:00
3452445559
remove ^M's
...
compile even without InnoDB
2004-06-25 11:33:03 +02:00
4092635155
fixed EXPLAIN behaviour with prepared statements (BUG#4271)
2004-06-25 11:37:43 +03:00
37314708b7
merged
2004-06-24 23:29:28 +02:00
1c37f8e20e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-24 19:47:53 +02:00
1ff21a9e64
bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() before
2004-06-24 19:46:50 +02:00
c6e2f6ac13
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 19:43:47 +03:00
de9cefaa77
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 19:03:58 +03:00
62aeb88638
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-06-24 18:51:32 +05:00
aa27a7858e
"Version" column in SHOW TABLE STATUS.
2004-06-24 18:46:41 +05:00
c218727dd2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-clean
2004-06-24 13:32:30 +00:00
17047d83f3
added posr switch to mysql-test-run
2004-06-24 13:28:15 +00:00
18cd61d0d0
bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
...
Redesigned the handler close functions so that they are usable
at different places where waiting for closing tables is done.
2004-06-24 15:06:56 +02:00
fa86cada0c
bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
...
Added put_length() to get_length() and unpack_key() to pack_key().
Keys were packed with the minimum size of the length field for the key part and
unpacked with length size of the base column.
For the purpose of optimal key packing we have the method pack_key(), while rows are
packed with pack(). Now keys are unpacked with unpack_key() and no longer with
unpack() which is used for rows.
2004-06-24 14:54:28 +02:00
e4270dd595
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-06-24 15:52:52 +04:00
0f9dc08188
added order by
2004-06-24 11:52:50 +00:00
d74558eb36
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2688
2004-06-24 12:07:00 +02:00
d3efbb9d3b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 10:55:48 +03:00
