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
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
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
7483b3cf96
parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204)
2004-06-24 02:57:57 +03:00
7480ef3840
disabling the --innodb-safe-binlog option. It should be fixed to work with MyISAM too,
...
before being available to users. That will be the case in 4.1.4.
The "bk commit in mysqldoc" corresponding to this feature was not pushed.
Removing the 6 tests, they'll be pushed again later.
2004-06-24 01:06:48 +02:00
bccf57fbb2
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-23 23:52:49 +02:00
fc234f2e4c
Bug#4261 - mysqldump omits NULLs with --skip-extended-insert
2004-06-23 21:46:17 +02:00
9f45c9e399
followup to handler cleanup
2004-06-23 21:26:34 +02:00
2f5c9b7aa5
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-23 18:58:52 +03:00
580cb3ddee
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-06-23 16:44:54 +03:00
ad86016e2f
lower_case_table_names=2 (Keep case for table names) was not honored
...
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109 )
Make net_buffer_length visible for mysql clients (Bug #4206 )
2004-06-23 16:44:34 +03:00
432020a18d
Modified ndbcluster_print_error to stack allocate table and handler, NOT for review, will make patch instead
2004-06-23 15:34:45 +02:00
9c2a961a63
Fix and test case for BUG#3899
2004-06-23 11:40:42 +04:00
97caae5109
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/pem/work/mysql-4.1
2004-06-23 09:07:14 +02:00
34ddd9c515
Fixed BUG#3486: FOUND_ROWS() fails inside stored procedure [and prepared statement].
2004-06-22 19:38:07 +02:00
b20dca925d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4200
2004-06-22 19:28:01 +04:00
e1cd282ea2
bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
...
dded code to clear the tail of the reference buffer if the actual key length
is less than the maximum key length.
2004-06-22 17:27:57 +02:00
eea19e5235
Fix for Bug# 4200 "Parse error on LIKE ESCAPE with parameter binding"
...
Now ESCAPE in LIKE will accept not only string literal but constant
delimited expression.
2004-06-22 19:27:16 +04:00
e71b693115
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-regexp-4.1
2004-06-22 15:17:40 +03:00
5ed07df98a
Merge
2004-06-22 13:48:51 +03:00
c6cd51798b
post-review changes (Bug#4090)
2004-06-22 13:41:57 +03:00
f3d11147c9
after merge fix
2004-06-22 14:48:29 +05:00
