database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-11 13:21:44 +03:00
Code
46,228 Commits 2,975 Branches 353 Tags
Commit Graph

1198 Commits

Author SHA1 Message Date
sasha@asksasha.com
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
georg@lmy002.wdf.sap.corp
aa044ab57a Changed/fixed error message from last commit 2005-08-04 02:06:21 +02:00
georg@lmy002.wdf.sap.corp
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
monty@mysql.com
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
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
e1b44e91fb Fixed proper merge of partitioning with 
WL #2301 ALTER TABLE optimisations
 2005-07-27 16:56:28 -04:00
monty@mysql.com
e59360ac86 Review of new code: 
Change argument order to be database, tablename for some functions
 2005-07-27 13:05:30 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
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
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64 Faster alter table code for 5.1. 2005-07-22 23:43:59 +03:00
jimw@mysql.com
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
jimw@mysql.com
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
ndbdev@dl145b.mysql.com
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
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
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
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ac6623f08f Fix merge 2005-07-20 22:30:34 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
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
mronstrom@mysql.com
4cb963439a Bug #10600 After review fixes 2005-07-20 21:19:01 +02:00
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02:00
dlenev@mysql.com
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
mronstrom@mysql.com
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
mronstrom@mysql.com
67087e2aa7 Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
tomas@poseidon.ndb.mysql.com
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
bar@mysql.com
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
bar@mysql.com
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
dlenev@mysql.com
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
bar@mysql.com
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
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
jimw@mysql.com
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
jimw@mysql.com
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
bell@sanja.is.com.ua
4bc6bd38ec Merge 2005-07-05 13:42:19 +03:00
bell@sanja.is.com.ua
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
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
bar@mysql.com
48f34a0bc5 sql_table.cc: 
Bug#11657 Creation of secondary index fails:

  If TINYBLOB key part length is 255, it is equal
  to field length. For BLOB, unlike for CHAR/VARCHAR,
  we should keep a non-zero key part length, otherwise
  "BLOB/TEXT column used in key specification without a key length"
  error is produced afterwards.

type_blob.result, type_blob.test:
  fixing tests accordinly
 2005-07-01 15:07:06 +05:00
ramil@mysql.com
2eea2f5208 a fix. 
bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
 2005-06-30 13:38:29 +05:00
monty@mishka.local
7398252d02 Portability fixes 
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
 2005-06-27 20:31:00 +03:00
msvensson@neptunus.(none)
85b9ffc4ca Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02:00
jimw@mysql.com
d11ef13ad9 Restore creation of files for temporary tables in the tmpdir, 
which was broken by an earlier bug fix. (Bug #11440)
 2005-06-21 11:25:51 -07:00
msvensson@neptunus.(none)
73c1578f15 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug10365
 2005-06-20 13:08:45 +02:00
tulin@dl145b.mysql.com
07b4a42e18 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-18 09:21:50 +02:00
acurtis@xiphis.org
51dd521dfc Bug#6877 MySQL should give an error if the requested table type is not available 
Implement new SQL mode - NO_ENGINE_SUBSTITUTION
 2005-06-17 22:14:44 +01:00
ndbdev@dl145b.mysql.com
8d44b54295 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-10 07:22:27 +02:00
jimw@mysql.com
1055c36000 Merge mysql.com:/home/jimw/my/mysql-5.0-10543 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-09 19:29:55 -07:00
acurtis@xiphis.org
3b8c3bd7e1 Merge 2005-06-09 17:15:06 +01:00
acurtis@xiphis.org
304bb0c66d Bug#11028 Crash on create table like 
Report error instead of crashing
 2005-06-09 16:06:15 +01:00
msvensson@neptunus.(none)
8771c73258 BUG#10365 Cluster handler uses non-standard error codes 
- Added better error messages when trying to open a table that can't be discovered or unpacked. The most likely cause of this is that it does not have any frm data, probably since it has been created from NdbApi or is a NDB system table.
 - Separated functionality that was in ha_create_table_from_engine into two functions. One that checks if the table exists and another one that tries to create the table from the engine.
 2005-06-08 13:31:59 +02:00
ndbdev@dl145b.mysql.com
2fb1fb5877 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-07 06:50:50 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
monty@mysql.com
29fd1f2fd9 Move USE_PRAGMA_IMPLEMENTATION to proper place 
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
 2005-06-03 23:46:03 +03:00
jimw@mysql.com
d147e69bb7 Additional tweak to fix for bug #10543, to prevent a change in 
behavior when extending fields that were fully part of a
multi-part key.
 2005-06-02 10:00:36 -07:00
tomas@poseidon.ndb.mysql.com
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
jimw@mysql.com
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
jimw@mysql.com
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