dlenev@brandersnatch.localdomain
d4b20f4a86
Fix for bugs #5859 "DROP TABLE does not drop triggers" and
...
#6559 "DROP DATABASE forgets to drop triggers".
If we drop table we should also drop all triggers associated with it.
To do this we have to check for existence of .TRG file when we are
dropping table and delete it too.
2005-03-27 16:15:21 +04:00
konstantin@mysql.com
eeeedd31b9
Manual merge
2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3
A fix for Bug#8226 "Cannot connect via shared memory":
...
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
2005-03-26 01:21:52 +03:00
brian@zim.(none)
aa44d86235
fixed conflict making embedded server with libmysqld
2005-03-25 14:12:46 -08:00
brian@zim.(none)
013c2ed3be
Fixing blackhole support in libmysqld
2005-03-25 14:09:19 -08:00
brian@zim.(none)
8e50a98e71
Adding rules for building blackhole, also updating test case.
2005-03-25 13:43:42 -08:00
brian@zim.(none)
3d2554bcef
Resolving merge.
2005-03-25 12:39:16 -08:00
brian@zim.(none)
89838b1ebc
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-03-25 12:37:24 -08:00
brian@zim.(none)
0c21adf370
Fix upgrade/downgrade issue.
2005-03-25 12:36:04 -08:00
brian@zim.(none)
274c3826a8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-03-25 12:34:07 -08:00
jimw@mysql.com
dee535be63
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-25 10:51:08 -08:00
brian@zim.(none)
7b81a9fd4c
Merging support for blackhole up to 5.0.
2005-03-25 10:36:58 -08:00
jimw@mysql.com
4f19826d80
Merge mysql.com:/home/jimw/my/mysql-4.1-9323
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:58 -08:00
jimw@mysql.com
4d2db80ee8
Merge mysql.com:/home/jimw/my/mysql-4.1-8499
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:30 -08:00
jimw@mysql.com
a13ef90ed1
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-25 09:42:18 -08:00
bar@eagle.intranet.mysql.r18.ru
97b5cbba41
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-25 17:35:37 +04:00
bar@mysql.com
0a72d12deb
mysql_client_test.c:
...
Don't run GBK test if not GBK support was compiled.
2005-03-25 17:30:51 +04:00
bar@eagle.intranet.mysql.r18.ru
5493b4a03b
Many files:
...
Moving UCS2 test into ctype_ucs
Bug#9232 Test failure: mysql_client_test and type_newdecimal
2005-03-25 17:17:17 +04:00
bar@eagle.intranet.mysql.r18.ru
e76019bc42
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
...
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-25 16:23:16 +04:00
gluh@gluh.mysql.r18.ru
fe0b425e0a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0.8941
2005-03-25 15:09:22 +03:00
bar@mysql.com
70abf0a046
Allow inserting of extra HKSCS and cp950 characters into a Big5 column.
2005-03-25 16:08:54 +04:00
gluh@gluh.mysql.r18.ru
a1e6b80b46
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-25 13:33:28 +03:00
gluh@gluh.mysql.r18.ru
bbd27199b6
Bug#9317: Wrong count for tables in INFORMATION_SCHEMA(fix after review)
2005-03-25 13:31:29 +03:00
gluh@gluh.mysql.r18.ru
d5e448870d
Fix for bug #8941 : garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*
...
-skip the print of 'MAX_ROWS=#' for 'SHOW CRETAE TABLE' with information schema tables
2005-03-25 12:19:11 +03:00
bar@eagle.intranet.mysql.r18.ru
9fbfa7a9af
func_str.result:
...
post-merge fix.
,
2005-03-25 11:47:25 +04:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732
Merge
2005-03-25 10:43:35 +04:00
brian@zim.(none)
6e2caeb0ce
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-03-24 16:08:48 -08:00
brian@zim.(none)
e65b96693c
Collection of changes per Bar and Serg.
2005-03-24 16:07:56 -08:00
msvensson@neptunus.(none)
eaa057e97a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 20:17:08 +01:00
jimw@mysql.com
3b090265ee
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-24 10:53:51 -08:00
msvensson@neptunus.(none)
f953016a6f
Removed faulty merge
2005-03-24 18:15:58 +01:00
msvensson@neptunus.(none)
66b31520e9
Manual merge
2005-03-24 18:11:13 +01:00
gbichot@quadita2.mysql.com
7b0e872695
testing repl of timezone with LOAD DATA INFILE (hourra!)
2005-03-24 16:43:50 +01:00
gbichot@quadita2.mysql.com
62fc95b985
rpl_deadlock.result:
...
result update (default value changed from 4.1 to 5.0)
2005-03-24 16:11:58 +01:00
gbichot@quadita2.mysql.com
32f1e3b029
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-03-24 15:44:50 +01:00
bar@mysql.com
15378f833f
myisamchk.c:
...
Wrong help string fix.
2005-03-24 18:21:56 +04:00
bar@mysql.com
56b931f818
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-24 18:11:35 +04:00
bar@mysql.com
29ffcad226
Fixed that LEFT OUTER JOIN was replaced with a regulat join
...
in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().
2005-03-24 18:10:46 +04:00
gbichot@quadita2.mysql.com
5acca04c7c
merge from 4.1
2005-03-24 14:32:40 +01:00
gluh@gluh.mysql.r18.ru
6ec480910d
Bug #9317 : Wrong count for tables in INFORMATION_SCHEMA
...
there was no check of result of
table->file->write_row() function. When count of rows was
more than table max_rows(HEAP table) the following recodrs
were not inserted to the table
-'schema_table_store_record' function is added.
The function checks result of write_row function
and convert HEAP table to MyISAM if necessary
- Result check after write_row is added into all
I_S function which store the records to I_S tables
2005-03-24 16:32:11 +03:00
msvensson@neptunus.(none)
ccea1af2ae
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug9303
2005-03-24 14:26:39 +01:00
msvensson@neptunus.(none)
bf2f6ff2d4
BUG#9303 blob field with specified length < 256 does not create tinyblob
2005-03-24 13:48:38 +01:00
konstantin@mysql.com
a8c1316c6b
Manual merge
2005-03-24 15:17:39 +03:00
konstantin@mysql.com
fd54ee4539
Fixes and test cases for Bug#8880 "Commands out of sync error with cursors"
...
and Bug#9159 "Server crash during mysql_stmt_close".
The patch adds support for single-row result sets in cursors.
2005-03-24 15:12:53 +03:00
msvensson@neptunus.(none)
fc7a83be00
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-24 12:30:57 +01:00
msvensson@neptunus.(none)
c4a698ea3e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 12:21:55 +01:00
joerg@mysql.com
c9d997b98c
The separate NDB information must be upgraded, too.
2005-03-24 10:52:29 +01:00
joerg@mysql.com
8200cadeae
Update the version, as 5.0.3 was already cloned, and future changes will go into 5.0.4
2005-03-24 10:48:28 +01:00
msvensson@neptunus.(none)
ef04608ecf
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-24 09:42:52 +01:00
jimw@mysql.com
9307f61cb2
Clarify comment to add which version of the C compiler for AIX needs to have
...
some code in a specific order.
2005-03-23 17:27:52 -08:00