mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16215 commits 2790 branches 343 tags 1.7 GiB
Commit graph

4245 commits

Author SHA1 Message Date
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
bar@mysql.com
8878c58fe2 Fixed thar proper charset was not set in Field_set::val_str() 2004-12-06 16:22:51 +04: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
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
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
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
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
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
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
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
guilhem@mysql.com
7219d2be90 two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever" 
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.
 2004-11-30 22:20:52 +01:00
bell@sanja.is.com.ua
f20e7a82b7 now we create temporary join for all queries with subqueries to make correct cleunup of tables and avoid too early unlock (BUG#6841) 2004-11-30 21:41:12 +02:00
tomas@poseidon.ndb.mysql.com
aec0b4e4d7 fixed error in test result 
added extra calls to retrieve connectstring used
    reengineered connect somewhat to make retries etc explicit
 2004-11-30 17:47:47 +00:00
tomas@poseidon.ndb.mysql.com
abb50b38ee ps_7ndb.result, ps_7ndb.test: 
ndb now runs ps tests just like the others
 2004-11-30 15:08:26 +00:00
ram@gw.mysql.r18.ru
3f741570e9 An additional test for 'CREATE DATABASE' with non-default character set. 2004-11-30 13:19:35 +04:00
ram@gw.mysql.r18.ru
0ca8fd2ee9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
 2004-11-30 12:27:17 +04:00
joreland@mysql.com
e86ce67ea5 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-30 07:43:19 +01:00
joreland@mysql.com
474f23a402 ndb - fixed long overdue problems with unique indexes and null values 2004-11-30 07:41:26 +01:00
tomas@poseidon.ndb.mysql.com
5e799e4a3b ndb_grant.later: 
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
 2004-11-29 08:06:53 +00:00
serg@serg.mylan
cb538e45f5 post-merge fix 2004-11-28 19:48:41 +01:00
serg@serg.mylan
96729c62be merged 2004-11-28 18:19:01 +01:00
serg@serg.mylan
989721d12f bad merge fixed 2004-11-28 17:06:40 +01:00
serg@serg.mylan
1a32157950 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-28 16:32:01 +01:00
serg@serg.mylan
7eccc3107f skip last compress test if we're short of RAM 2004-11-28 16:31:14 +01:00
monty@mysql.com
eb304bd49f Fixes while reviewing code 
(Cleanups and better bug fixes)
 2004-11-26 02:31:22 +02:00
bell@sanja.is.com.ua
3c108b2a84 init values to avoid junk returning in case of null value asking without assigning value (BUG#6806) 2004-11-25 22:54:49 +02:00
mats@mysql.com
4ac392fa45 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/bkroot/mysql-4.1
 2004-11-25 13:35:53 +01:00
timour@mysql.com
f1e86036ee Merge mysql.com:/home/timka/mysql/src/4.0-virgin 
into mysql.com:/home/timka/mysql/src/4.0-master
 2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c Merge 2004-11-25 12:23:41 +01:00
timour@mysql.com
38ab93c6be Merge for BUG#3759 which was missing from the main tree for some reason. 2004-11-25 11:37:28 +02:00