guilhem@mysql.com
2f95fc2701
Merge mysql.com:/home/mysql_src/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
jimw@mysql.com
f8ce7bc01e
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-17 13:37:30 -08:00
gluh@eagle.intranet.mysql.r18.ru
7803d80aa4
Fix for bug#13818 SHOW CREATE VIEW / TABLE and information_schema.views fail
...
for invalid view
Permit SHOW CREATE VIEW, SHOW CREATE TABLE, and retrieval of metadata from
information_schema for invalid views
2005-11-11 13:39:46 +04:00
anozdrin@mysql.com
1d3867faa5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-wl2818
2005-11-11 03:25:24 +03:00
brian@zim.(none)
8ca332d38e
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/show-5.1-new
2005-11-10 15:42:56 -08:00
brian@zim.(none)
31cdb3dd7d
Show engines has been extended to now report if an engine has transactions, XA, or savepoints.
2005-11-10 15:40:00 -08:00
anozdrin@mysql.com
491e4f89f5
WL#2818 (Add creator to the trigger definition for privilege
...
checks on trigger activation)
2005-11-10 22:25:03 +03:00
brian@grrr.local
9807162144
Added "SHOW AUTHORS" code
2005-11-10 19:43:17 +02:00
brian@zim.(none)
510d0f24c8
Added handlerton flag to make storage engines invisable via flag.
2005-11-10 08:24:21 -08:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
svoj@poseidon.ndb.mysql.com
3791197f0d
WL#2575 - Fulltext: Parser plugin for FTS
...
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
2005-11-06 13:13:06 +01:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
jani@ua141d10.elisa.omakaista.fi
0f83ba137a
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-11-03 16:43:05 +02:00
jani@ua141d10.elisa.omakaista.fi
0ee589b4d6
Changes in get_table_type() and mysql_frm_type(). The main problem was
...
that in mysql_rm_table_part2_with_lock() previously we needed to open
same file twice. Now once is enough.
2005-11-03 16:10:11 +02:00
jimw@mysql.com
15da5308c3
Avoid possible race condition in accessing slave statistics
...
during shutdown. (Bug #11796 )
2005-11-01 11:48:55 -08:00
msvensson@neptunus.(none)
be6f7a3f82
Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:00:54 +02:00
ramil@mysql.com
c06673d49b
Fix for bug #14290 : wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.
2005-10-25 17:22:58 +05:00
ramil@mysql.com
02c0fe62d8
a fix (bug #14207 : strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH).
2005-10-24 16:45:27 +05:00
ramil@mysql.com
a9d1a37477
Fix for bug #14064 : information_schema test fails on opnsrv6c.
2005-10-18 17:23:18 +05:00
ramil@mysql.com
35c75bebe6
Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values
...
instead of Field_longlong::store(double nr).
2005-10-14 19:12:54 +05:00
msvensson@neptunus.(none)
7d29c2a4a1
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
2005-10-12 13:59:00 +02:00
msvensson@neptunus.(none)
0ac28d3187
Always test ssl and compress
...
- Updated after review
2005-10-12 13:56:07 +02:00
monty@mysql.com
5513ab69b7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-12 00:59:52 +03:00
monty@mysql.com
f5fdf3e87a
Reviewing new pushed code
...
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
(Some old systems returns ETIME and it's safer to test for both values
than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
2005-10-12 00:58:22 +03:00
eric@mysql.com
215ecd3322
BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE
2005-10-10 17:41:36 -07:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
msvensson@neptunus.(none)
cb96f195c8
Improved testing of ssl and compression
...
- Added show status variable "compression" for checking that compression is turned on.
- Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.
- Setup server to accept ssl connections from clients ig that is supported by server
- New tests
- ssl - Run with ssl turned on
- ssl_compress - Run with ssl and compression turned on
- compress - Run with compression turned in
- Updated test
- openssl_1, rpl_openssl1 - Changed to run if server supports ssl
2005-10-04 15:43:55 +02:00
evgen@moonbone.local
5a10244d8b
Fix bug#13535 Incorrect result from SELECT statement after SHOW TABLE STATUS
...
After SHOW TABLE STATUS last_insert_id wasn't cleaned, and next select
erroneously rewrites WHERE condition and returs a row;
5.0 isn't affected because of different SHOW TABLE STATUS handling.
last_insert_id cleanup added to mysqld_extend_show_tables().
2005-10-03 23:22:46 +04:00
brian@zim.(none)
0ba8ca2a17
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/fix-5.0
2005-10-02 20:13:18 -07:00
brian@zim.(none)
54a958993c
Next big patch for loadable storage engines!
...
Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail.
2005-10-02 19:44:28 -07:00
gluh@mysql.com
b36f63e3ab
4.1 -> 5.0 merge
2005-09-29 16:35:50 +05:00
gluh@eagle.intranet.mysql.r18.ru
f9762c47d0
Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
...
"CHARACTER SET", "COLLATE", and "DEFAULT" are always
printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
"AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only
if NO_FIELD_OPTIONS is not set.
2005-09-29 16:17:45 +05:00
dlenev@mysql.com
87dcb3c6f5
Fix for bug #13407 "Remote connecting crashes server" and couple of similar
...
problems which were introduced during work on WL#2787 "Add view definer/owner
to the view definition (.frm) to check privileges on used tables and stored
routines when using a VIEW."
In some cases it is better to use value from Security_context::host_or_ip
instead of value from Security_context::host since the latter can be NULL
in certain situations (When we can't resolve hostname or we have not done
this yet).
2005-09-22 23:03:53 +04:00
bell@sanja.is.com.ua
3f66053a50
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
2005-09-20 21:27:28 +03:00
bell@sanja.is.com.ua
c1b185f5ff
WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.)
...
Part 2 postreview fixes.
2005-09-20 21:20:38 +03:00
pappa@c-1309e253.1238-1-64736c10.cust.bredbandsbolaget.se
2530fcde11
Handle default engine type better for
...
partitioned tables
2005-09-20 10:29:59 -04:00
bell@sanja.is.com.ua
27aa2ae30c
fixed length detection
2005-09-16 09:15:45 +03:00
ndbdev@dl145c.mysql.com
597ccdfac2
merge
2005-09-16 06:54:34 +02:00
bell@sanja.is.com.ua
aec371f910
WL#2787 (part 2, ver 3 (merged)) changed securety context switching
2005-09-15 22:29:07 +03:00
bell@sanja.is.com.ua
ff994c326e
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-15 15:39:44 +03:00
msvensson@neptunus.(none)
10eee79363
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-15 11:32:49 +02:00
bell@sanja.is.com.ua
630cdd7d0c
Information schema fix for WL#2787
2005-09-15 11:56:06 +03:00
ingo@mysql.com
e0d668baa3
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 18:22:43 +02:00
tulin@dl145c.mysql.com
ea4161baed
merge
2005-09-14 17:58:20 +02:00
tulin@dl145c.mysql.com
b127139206
Bug #13179 partition info in mysqldump makes it hard to use dump in different sized cluster
2005-09-14 17:30:23 +02:00
tulin@dl145c.mysql.com
80da104ea5
merge
2005-09-14 13:37:52 +02:00
ingo@mysql.com
18cb2e8388
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-14 13:37:16 +02:00
ingo@mysql.com
6e725adc00
Bug#12920 - key_read_requests counter appears to re-set
...
After merge fix.
2005-09-14 13:18:16 +02:00
bell@sanja.is.com.ua
9388f7277c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-14 12:26:09 +03:00
bell@sanja.is.com.ua
914b961d01
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
2005-09-14 11:07:04 +03:00