01ce8a8aa9
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-12 20:18:49 +03:00
d9bd3c11e4
Fix for bug #6008 : MySQL does not create warnings when creating database and using IF NOT EXISTS
...
produce warning for 'create database if not exists' if database exists
do not update database options in this case
produce warning for 'create table if not exists' if table exists
2005-09-12 17:09:19 +05:00
345dfef41f
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-02 08:59:59 +02:00
211b78b6ee
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-01 09:05:45 +02:00
1d997477aa
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 15:24:06 -07:00
f75ac7fb82
fix for bug#12913
...
(Simple SQL can crash server or connection)
(not initialized member leads to server crash)
2005-09-01 00:13:02 +02:00
583979d949
merge
2005-08-31 20:45:48 +02:00
0dc444ec4e
Fix incorrect spellings of "dropped" in source and tests. (Bug #12828 )
2005-08-30 12:24:37 -07:00
9b11c9a822
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-30 08:18:27 +02:00
1668c45d30
fix for bug 12207 (alter table discard tablespace on MyISAM table
...
causes ERROR 2013).
(all-in-one approved patch)
2005-08-29 21:00:43 +02:00
5d41d5e0f4
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-29 18:18:30 +02:00
330eb04536
Bug#12296 - CHECKSUM TABLE reports 0 for the table
...
Skipping deleted records instead of breaking the loop
during checksum calculation.
2005-08-29 17:08:41 +02:00
d591705e69
merged
2005-08-26 13:24:59 +04:00
02056f8e3a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
f384e08277
Merge mishka.local:/home/my/mysql-4.1
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
9af0f156a5
Improve default error message for optimize/repair table
2005-08-24 10:41:44 +02:00
eadb86d56f
after pull cleanup
2005-08-22 13:20:02 +04:00
33811ac3a3
Fixed back some bin log writes to avoid merge problems
...
Added missing #ifdef for partitioning
2005-08-20 16:56:54 -04:00
5e91e260e6
WL #2602 , #2603 , #2604
...
Added new syntax for partition management
2005-08-19 10:26:05 -04:00
c594ab7921
updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication).
...
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query
logging does work.
2005-08-18 21:40:14 -06:00
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
c44fe70d02
patch for BUG#4680 - drop database breaking replication if there were extra files
...
in the database directory on the master
2005-08-03 18:08:20 -06:00
aa044ab57a
Changed/fixed error message from last commit
2005-08-04 02:06:21 +02:00
7251e9dbd8
Fix for bug #6859 (after Sanja's review)
...
Added check which throws ER_WRONG_OBJECT error in case the .frm
doesn't contain a valid table type (e.g. view or trigger)
2005-08-03 07:29:48 +02:00
15d48525af
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
e1b44e91fb
Fixed proper merge of partitioning with
...
WL #2301 ALTER TABLE optimisations
2005-07-27 16:56:28 -04:00
e59360ac86
Review of new code:
...
Change argument order to be database, tablename for some functions
2005-07-27 13:05:30 +03:00
8f10662eab
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2005-07-23 00:15:53 +03:00
2657e48c64
Faster alter table code for 5.1.
2005-07-22 23:43:59 +03:00
49e5636410
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:35:15 -07:00
6eae678f56
Fix error message generated when trying to create a table in a
...
non-existent database. (Bug #10407 )
2005-07-21 20:08:54 -07:00
f4fe2c3b71
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-21 08:06:26 +02:00
6026054ead
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-07-21 01:29:57 -04:00
ac6623f08f
Fix merge
2005-07-20 22:30:34 -04:00
9663b9a974
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
2005-07-20 21:58:33 -04:00
4cb963439a
Bug #10600 After review fixes
2005-07-20 21:19:01 +02:00
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
8a3e723b74
Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch)
...
"Triggers have the wrong namespace"
"Triggers: duplicate names allowed"
"Triggers: CREATE TRIGGER does not accept fully qualified names"
"SHOW TRIGGERS"
2005-07-19 20:06:49 +04:00
2d23c691f7
Bug #10600
...
remove_table_from_cache fails to signal other thread and gets
blocked when other thread also gets blocked
2005-07-19 00:29:19 +02:00
67087e2aa7
Patch for push of wl1354 Partitioning
2005-07-18 13:31:02 +02:00
911d878ca9
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
7d405e3c65
Merge mysql.com:/usr/home/bar/mysql-4.1.num-conv
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-14 16:11:55 +05:00
1b612b0006
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.num-conv
2005-07-14 10:46:15 +05:00
f334ea1fc6
Implementation of Monty's idea: Now we can open mysql.proc table for lookup
...
of stored routines definitions even if we already have some tables open and
locked. To avoid deadlocks in this case we have to put certain restrictions
on locking of mysql.proc table.
This allows to use stored routines safely under LOCK TABLES without explicitly
mentioning mysql.proc in the list of locked tables. It also fixes bug #11554
"Server crashes on statement indirectly using non-cached function".
2005-07-13 13:48:13 +04:00
5150fdcc04
ctype_utf8.result:
...
adding test case
sql_table.cc:
sql_table.cc:
- do not create a new item when charsets are the same
- return ER_INVALID_DEFAULT if default value cannot
be converted into the column character set.
item.cc:
- Allow conversion not only to Unicode,
but also to and from "binary".
- Adding safe_charset_converter() for Item_num
and Item_varbinary, returning a fixed const Item.
2005-07-13 13:00:17 +05:00
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
2669b86612
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 15:23:13 -07:00
9f654b806a
Merge mysql.com:/home/jimw/my/mysql-4.1-11440
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:54:12 -07:00
4bc6bd38ec
Merge
2005-07-05 13:42:19 +03:00
cee0f3f608
fixed environment creation and cleaning up for processing view one by one during checking (BUG#11337)
2005-07-05 13:37:02 +03:00
