bef102ec90
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 09:50:47 +02:00
8b0daa8445
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-01 16:13:25 -07:00
5a271e2c12
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-01 16:13:24 -07:00
f5f88703b2
Fix compile error when HAVE_BERKELEY_DB
2005-06-01 16:03:41 -07:00
b8f3c515ba
Merge mysql.com:/home/jimw/my/mysql-4.1-9660
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:02:26 -07:00
0a2d95e983
Merge mysql.com:/home/jimw/my/mysql-4.1-8135
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 12:59:11 -07:00
c82cb2c26a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-01 17:41:36 +02:00
0a1e38b7ed
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
Manual merge from 4.1.
2005-06-01 11:15:21 +02:00
c420599581
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
Hand merged from 4.0.
2005-05-31 19:37:24 +02:00
5088b28d09
Merge
2005-05-31 14:37:47 +02:00
51d80960ea
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.
2005-05-31 11:08:14 +02:00
1cc23599c2
Cleanups to patch for bug #9660 after review by Monty.
2005-05-26 10:01:26 -07:00
aac55df4f4
Fix table renaming to not lowercase table names for all storage
...
engines when lower_case_table_names == 2, as it did previously
for InnoDB and MEMORY. (Bug #9660 )
2005-05-25 20:26:40 -07:00
ef9ef1f958
Fix partial keys when converting VARCHAR to TEXT. (Bug #10543 )
2005-05-25 18:11:47 -07:00
cb7cd33222
Fix that we can read tables with the 'older' decimal format used in 5.0.3 & 5.0.4
...
We will however give a warning when opening such a table that users should use ALTER TABLE ... FORCE to fix
the table. In future release we will fix that REPAIR TABLE will be able to handle this case
2005-05-25 18:33:36 +03:00
2fde78052b
Fix error reporting for 'OPTIMIZE TABLE' on InnoDB tables. (Bug #8135 )
2005-05-24 11:11:40 -07:00
23f79bd1f2
merge
2005-05-17 10:17:53 +02:00
d06bb6fa39
After merge fixes
2005-05-16 15:21:35 +03:00
9db45adb60
Merge with 4.1
2005-05-14 18:31:22 +03:00
beb5867dfb
After merge fixes
2005-05-14 16:24:36 +03:00
b4e92e6360
Merge with 4.0
2005-05-14 00:01:40 +03:00
20f969b256
Change create_field->offset to store offset from start of fields, independent of null bits.
...
Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236
2005-05-13 11:11:50 +03:00
152f751831
fix (Bug #8295 and #8296 : varchar and varbinary conversion)
...
select, gis & gis-tree tests fails at the moment, but
I will push this CS because it was tested before and I'm absolutely
sure it's right.
2005-05-12 15:56:04 +05:00
c33a0673a6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/Users/mikron/wl1682
2005-05-12 12:01:01 +02:00
d51308aec4
Bug#6236
...
Incomplete ALTER TABLE breaks MERGE compatibility
Fix implicit NOT NULL not set on ALTER of PK columns
2005-05-08 21:03:50 +01:00
a8febcd7d2
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897
2005-05-07 12:21:48 +00:00
d76be7ab3f
Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
...
thd->lex->derived_tables should be zero(it may be changed if we open a view)
2005-05-07 12:17:54 +00:00
c18a302577
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/Users/mikron/wl1682
2005-05-07 11:23:09 +02:00
b4ab00df62
WL 1682: Bitvector for updated/read fields in handler interface
...
Fixed clear issues of bitvector and memory allocation issues
2005-05-07 10:00:25 +02:00
015cd1cd21
merge
2005-05-06 13:51:58 +03:00
a9f6aab4c9
Fixes while reviewing new code
...
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
7bab94f36b
Clean up merge from 4.1
2005-05-02 10:19:37 -07:00
f7cd6b8aa1
WL 1682: After review fixes + update bitvector class + bitvector test
...
cases + bug fixes
2005-05-02 15:45:33 +02:00
8ef6ae7442
Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names
...
is set on case-sensitive file systems and the source table
was specified in something other than lowercase. (Bug #9761 )
2005-04-28 15:30:42 -07:00
21347433cf
WL 1682: Use bitvector instead of query_id to tell handler which fields
...
to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak)
2005-04-28 14:45:27 +02:00
f638e5cb8f
Bug#9102 - Stored proccedures: function which returns blob causes crash
...
Initialization of fields for sp return type was not complete.
2005-04-19 09:09:25 +01:00
f93ebc20ac
Bit type: code clean-up.
2005-04-12 23:12:00 +05:00
eae4d9c073
Bit type: code cleanup.
2005-04-12 19:36:21 +05:00
3b1c3d8c68
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.bit_class
2005-04-12 12:30:09 +05:00
c4376b2bc6
Bit type support for non-MyISAM tables.
2005-04-12 12:27:43 +05:00
e0831dce7a
merge from 4.1
2005-04-11 16:59:06 +02:00
c7c928f168
Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log"
...
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
2005-04-11 16:46:03 +02:00
71f530c4ea
merge
2005-04-11 15:11:52 +05:00
b5328a7dbc
InnoDB: Prevent ALTER TABLE ... ENGINE=...
...
if there are foreign key constraints on the table. (Bug #5574 )
2005-04-07 12:16:41 +03:00
48de1ff277
Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)
2005-04-05 01:19:48 +03:00
04f8e164fb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-04 16:45:23 +03:00
fc1e7b07d6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-trg3
2005-04-03 17:02:13 +04:00
7b294bdc8d
Merge of patch for bug #3891 into 5.0 tree.
2005-04-03 10:36:18 +04:00
7ba99ee324
merged
2005-04-02 20:28:58 +02:00
3098b93ef8
bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
...
sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)
2005-04-02 20:13:19 +02:00
