1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00
Commit Graph

5467 Commits

Author SHA1 Message Date
gluh@gluh.mysql.r18.ru
0282d03215 Syntax extention: 'ALTER DATABASE' without db name (after review) 2004-12-06 19:01:51 +03:00
monty@mysql.com
75d0958dc3 After merge fixes
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
2004-12-06 17:15:54 +02:00
serg@serg.mylan
39607559e9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-06 14:51:38 +01:00
mskold@mysql.com
3791170159 Fix for bug#6935 table rename does not work with ndb tables 2004-12-06 14:51:10 +01:00
serg@serg.mylan
05d038fc5a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-06 14:21:33 +01:00
mskold@mysql.com
75da2fb3f4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-06 14:15:52 +01:00
bar@mysql.com
8878c58fe2 Fixed thar proper charset was not set in Field_set::val_str() 2004-12-06 16:22:51 +04:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
joreland@mysql.com
067afe3a89 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/wl2126
2004-12-06 09:56:00 +01:00
joreland@mysql.com
a16633a2fb Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/wl2126
2004-12-06 09:29:36 +01:00
hf@deer.(none)
e211b26330 Fix for bug #6755 (ALTER TABLE ENABLE KEYS corrupts spatial index) 2004-12-06 11:42:41 +04:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
monty@mysql.com
86508ad969 Fix test results 2004-12-06 01:34:19 +02:00
bell@sanja.is.com.ua
1b07e3b2db postreview fixes 2004-12-04 00:14:18 +02:00
bell@sanja.is.com.ua
a3ad1765a8 merge 2004-12-03 23:24:41 +02:00
bell@sanja.is.com.ua
b48ec20ac7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2004-12-03 22:40:11 +02:00
bell@sanja.is.com.ua
734ffb8452 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
2004-12-03 22:13:53 +02:00
jimw@mysql.com
5c29de39bd Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTS 2004-12-03 18:42:35 +01:00
jimw@mysql.com
48fc4cbc6b Merge 2004-12-03 17:48:19 +01:00
serg@serg.mylan
b00395fca8 compatibility fix (2G filesize limit) 2004-12-03 17:35:50 +01:00
mats@mysql.com
fe70f8c747 Merge mysql.com:/space/bkroot/mysql-4.1
into mysql.com:/space/bk/b6391-mysql-4.1
2004-12-03 12:15:31 +01:00
mats@mysql.com
2bbdf2403d Bug#6391 (binlog-do-db rules ignored)
CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database.
2004-12-03 12:13:51 +01:00
jimw@mysql.com
08f771a0cc Manual fixes to merge of fix for Bug #6682 to 4.1. 2004-12-03 02:44:33 +01:00
jimw@mysql.com
4b8e96d5ca Merge 2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682)
(Original fix reimplemented after review by Serg and Guilhem.)
2004-12-03 00:05:11 +01:00
guilhem@mysql.com
f3b577f591 Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable
(especially in case of bug like BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever").
2004-12-02 23:02:38 +01:00
lenz@mysql.com
eb6c38fe9c - updated lowercase_table3 test result (T1.InnoDB -> T1.ibd). Failure was
discovered on Mac OS X
2004-12-02 21:32:36 +01:00
mskold@mysql.com
cca3fc671f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-02 14:25:55 +01:00
monty@mysql.com
55cc515c8f merged on pull 2004-12-02 14:47:14 +02:00
hf@deer.(none)
c7ef44857f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-02 16:46:30 +04:00
monty@mysql.com
d1a666d59a Cleanups during review stage
Added auto-correct of field length for enum/set tables for ALTER TABLE
This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE
2004-12-02 14:43:51 +02:00
hf@deer.(none)
71bfbbdcd0 Fixes to make mysql-test-run --embedded-server working 2004-12-02 16:08:17 +04:00
matthias@three.local.lan
257d1f6db3 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-02 12:54:32 +01:00
ram@gw.mysql.r18.ru
3b111a9b42 A fix (bug #6878: Crash with engine=memory). 2004-12-02 15:06:15 +04:00
ram@gw.mysql.r18.ru
7ed2753300 A fix (bug #6878: Crash with engine=memory). 2004-12-02 14:34:53 +04:00
ram@gw.mysql.r18.ru
c78eefbc95 Fixes (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv
bug #6933: error in the tests/grant.pl test).
2004-12-02 13:34:30 +04:00
bar@mysql.com
a09a603d83 Bug #6379: ENUM values are incorrectly converted
- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
  we don't know column charset yet, to 
  mysql_prepare_table(), where we do.
2004-12-02 12:48:43 +04:00
tomas@poseidon.ndb.mysql.com
352a6a3854 ps_7ndb.result:
fixed ps_7ndb test
2004-12-01 17:35:18 +00:00
bar@mysql.com
a38160f370 Move common trailing space checks into an include file.
Check UCS2 trailing spaces.
2004-12-01 19:25:05 +04:00
joreland@mysql.com
f36b81cb35 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-01 12:53:09 +01:00
joreland@mysql.com
4ed3b34c2f Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-01 12:50:13 +01:00
joreland@mysql.com
5832078015 wl#2126 - ndb - Fix handling of null values wrt read multi range 2004-12-01 12:43:30 +01:00
joreland@mysql.com
0718f788d6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:15:25 +01:00
joreland@mysql.com
64d6563afa Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:13:55 +01:00
joreland@mysql.com
9acd3ea38d testcase for bug#6871, ndb, replace with collations 2004-12-01 10:13:18 +01:00
bell@sanja.is.com.ua
4c017d18e2 Merge 2004-12-01 10:25:11 +02:00
mskold@mysql.com
da1f5728fd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-01 09:22:26 +01:00
mwagner@mysql.com
2e0d1b3f9c openssl_1.result, have_openssl_1.require, openssl_1.test:
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
2004-12-01 02:35:02 +01:00
mysqldev@mysql.com
051a5820e6 strict.result:
Add warning line to result so that test passes
2004-12-01 00:30:42 +01:00
guilhem@mysql.com
81609d6e1c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-30 22:22:12 +01:00