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

3319 commits

Author SHA1 Message Date
magnus@neptunus.(none)
4d7edeff8e Updated ndb_basic test 2004-05-17 09:40:35 +02:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
serg@serg.mylan
0dc8aacf7d merged 2004-05-15 11:26:58 +02:00
serg@serg.mylan
da63a927f2 bad old merge fixed 2004-05-15 11:20:42 +02:00
monty@mysql.com
9f171e7794 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-15 11:58:08 +03:00
monty@mysql.com
e0a4b51215 Better fix for bug #3749 (bug in deleting automatic generated foreign keys) 2004-05-15 11:57:40 +03:00
bell@sanja.is.com.ua
a785d16d8a results fix 2004-05-15 11:20:43 +03:00
guilhem@mysql.com
a039062ef3 Replication testsuite: making the master-slave synchronization less likely to fail, 
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.
 2004-05-14 23:08:03 +02:00
sergefp@mysql.com
3711c98b2a Trivial manual merge 2004-05-15 00:06:16 +04:00
bell@sanja.is.com.ua
712d379b5e check of item name presence in find_item_in_list (Bug #3752) 2004-05-14 18:55:24 +03:00
bell@sanja.is.com.ua
bb34b56bfd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
 2004-05-14 15:29:23 +03:00
bell@sanja.is.com.ua
a9501fd7aa after merge fix 2004-05-14 15:28:59 +03:00
bell@sanja.is.com.ua
3f6857112c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
 2004-05-14 14:45:27 +03:00
serg@serg.mylan
67f1c04ffc better fix for bug#3749 - do not consider already removed keys in key removal process 2004-05-14 12:49:18 +02:00
bell@sanja.is.com.ua
71a374dc13 Merge 2004-05-14 13:33:02 +03:00
bell@sanja.is.com.ua
a71771788e Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-05-14 11:11:48 +03:00
bell@sanja.is.com.ua
8f957583f1 fixed flags of printed query 2004-05-14 11:09:57 +03:00
bar@bar.intranet.mysql.r18.ru
6ecea2fa93 Bug #3403 Wrong encoding in EXPLAIN SELECT output 2004-05-14 13:08:22 +05:00
bar@bar.intranet.mysql.r18.ru
2fc1d5c146 Bug #3403 Wrong encoding in SHOW GRANTS, EPLAIN SELECT output 
This change fixes SHOW GRANTS problem, while EXPLAIN will be fixed
in a separate patch.
 2004-05-14 12:16:27 +05:00
bell@sanja.is.com.ua
4c774e0c18 fixed flags of printed query 2004-05-13 23:47:20 +03:00
magnus@neptunus.(none)
581819624f Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-13 13:28:56 +02:00
monty@mysql.com
116f61c656 Don't automaticly generate a new key for a foreign key constraint if there is already a usable key. 
Prefer not automatic keys before automatic keys. If there is two conf
 2004-05-12 00:29:52 +03:00
tsmith@build.mysql.com
6ad9691dc8 Merge build:/home/bk/mysql-4.1 
into build.mysql.com:/users/tsmith/m/41/mysql-4.1
 2004-05-11 14:44:25 +02:00
serg@serg.mylan
6f32682524 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-05-11 12:40:07 +02:00
serg@serg.mylan
423f37b92b out-of-bound array access fixed 2004-05-11 12:39:00 +02:00
serg@serg.mylan
d14e4eb57c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-05-11 12:20:04 +02:00
serg@serg.mylan
8a03c1b869 bug#3612 - Item_func_div set decimals incorrectly 2004-05-11 12:19:37 +02:00
magnus@neptunus.(none)
62fe381192 Updated ndb_* test cases 
Added two new, ndb_replace and ndb_minmax
 2004-05-11 10:40:48 +02:00
bar@bar.intranet.mysql.r18.ru
f16dac0492 Use Windows code page 1252 instead of real ISO 8859-1 2004-05-11 13:32:01 +05:00
tsmith@build.mysql.com
8746a7dab4 logging_ok: 
Logging to logging@openlogging.org accepted
item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704)
 2004-05-10 23:19:50 +02:00
magnus@neptunus.(none)
beff6a44c7 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-10 15:09:19 +02:00
magnus@neptunus.(none)
787c978673 Merged ha_ndbcluster.cc 2004-05-10 15:06:07 +02:00
magnus@neptunus.(none)
794b3b52d9 Updated ndb_basic 2004-05-10 14:14:14 +02:00
ingo@mysql.com
f28616c02b Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug2831
 2004-05-10 13:54:32 +02:00
serg@serg.mylan
c50e85bd7c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-05-10 12:39:31 +02:00
serg@serg.mylan
2cbc4e71fc backport from 4.1: 
"phrase search" should not match partial words (it should not match 'paraphrase searches')
 2004-05-10 12:39:01 +02:00
ingo@mysql.com
4bb5c83a62 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug2831
 2004-05-10 12:36:09 +02:00
ingo@mysql.com
309c7412f6 Fix replace_result of $MASTER_MYPORT instead of literal numbers. 2004-05-10 12:15:40 +02:00
bell@sanja.is.com.ua
d2fa79b291 keep old engine & JOIN if we changed subquery Item (Bug #3646) 2004-05-07 23:06:11 +03:00
magnus@neptunus.(none)
97ffc1f408 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-07 16:21:54 +02:00
marko@hundin.mysql.fi
11f9ec1dc5 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-07 12:48:01 +03:00
marko@hundin.mysql.fi
c066b3022e Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1 2004-05-07 12:13:45 +03:00
sergefp@mysql.com
7af3097e60 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-05-07 03:33:39 +04:00
sergefp@mysql.com
7084c77651 Added a test for a problem that was fixed by automerge and fixed a typo. 2004-05-07 03:32:51 +04:00
monty@mysql.com
939ea71ecd Portability fixes 
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
 2004-05-07 01:43:17 +03:00
sergefp@mysql.com
67ad78cb5d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-05-06 23:02:32 +04:00
bell@sanja.is.com.ua
3aae50e8c0 EXPLAIN UNION using same routing which used for execution which allow return correct bug messages (Bug #3639) 
EXPLAIN of hidden SELECT of UNION
 2004-05-06 20:40:21 +03:00
monty@mysql.com
28673669a4 Merge with 4.0 to get security patch for check_grant_colum 2004-05-06 13:42:26 +03:00
marko@hundin.mysql.fi
007e6210d4 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-06 09:53:50 +03:00
monty@mysql.com
f6dc9169e2 Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666) 
The bug was introduced in a patch in the 4.1.2 source tree.
 2004-05-06 04:40:45 +03:00