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

5250 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
05d4ed14e4 merge 4.1->5.0 2005-03-31 10:39:48 +03:00
bell@sanja.is.com.ua
dc87075f86 postmerge fixes 2005-03-30 23:08:03 +03:00
bell@sanja.is.com.ua
c64efa6062 merge 2005-03-30 22:11:08 +03:00
ramil@mysql.com
e9dbf09dfc Merge 2005-03-30 17:07:40 +05:00
sergefp@mysql.com
86e3a378ea Fix for BUG#9213: GROUP BY returns wrong query results: 
Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.
 2005-03-30 15:57:42 +04:00
bar@mysql.com
63d2f81a07 Remove .opt file for faster test running. 2005-03-30 14:10:27 +05:00
bell@sanja.is.com.ua
dcdda90a11 Merge 2005-03-30 10:27:36 +03:00
bell@sanja.is.com.ua
4fdb0f48e7 postreview changes 
fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350)
 2005-03-30 10:07:08 +03:00
serg@serg.mylan
884abd39fc Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-30 00:27:35 +02:00
serg@serg.mylan
ab5c10c100 after merge fix 2005-03-30 00:24:58 +02:00
joerg@mysql.com
27a0de2443 Propagate the new '--with-big-tables' flag from 4.1 to 5.0. 
Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
which will follow in a separate changeset.
 2005-03-29 21:06:22 +02:00
mskold@mysql.com
fb65ac1551 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-03-29 17:56:34 +02:00
mskold@mysql.com
f8101348f5 New test result 2005-03-29 15:36:02 +02:00
bar@mysql.com
e8b86b0410 type_bit.result: 
after merge fix
  ,
 2005-03-29 17:41:17 +05:00
bar@mysql.com
7131f313be after merge fix 2005-03-29 17:37:10 +05:00
bar@mysql.com
ba115894c5 Better error message. 
Bugs#9057: Incorrect errormsg for too-large char field in table definition
 2005-03-29 15:43:00 +05:00
pekka@mysql.com
727015dbb3 Merge 2005-03-28 23:06:19 +02:00
serg@serg.mylan
55d3d94c3b Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-28 13:56:27 +02:00
bar@eagle.intranet.mysql.r18.ru
f0d41136df Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1 
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
 2005-03-28 14:23:03 +05:00
bar@mysql.com
9852c6a082 union.test: 
Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
  Prove that this problem was fixed with bug9425 fix too.
 2005-03-28 14:17:47 +05:00
bar@eagle.intranet.mysql.r18.ru
ef81035ff4 Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1 
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
 2005-03-28 14:08:25 +05:00
bar@mysql.com
e60daecc87 Bug#9425 A user variable doesn't always have implicit coercibility 
Coercibility fixes for numeric types and not defined values were done.
 2005-03-28 14:01:57 +05:00
serg@serg.mylan
a2f7cceb82 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-28 10:20:41 +02:00
bar@eagle.intranet.mysql.r18.ru
d19fff495b Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1 
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
 2005-03-28 12:34:00 +05:00
bar@mysql.com
06bcfe8886 func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result: 
Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.
 2005-03-28 12:24:12 +05:00
serg@serg.mylan
a2ad96cf9e more wild_compare tests 2005-03-27 15:46:06 +02:00
serg@serg.mylan
2dd1847bc2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-26 19:49:24 +01:00
gbichot@quadita2.mysql.com
e207736b84 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-03-26 19:20:13 +01: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)
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
brian@zim.(none)
7b81a9fd4c Merging support for blackhole up to 5.0. 2005-03-25 10:36:58 -08:00
gbichot@quadita2.mysql.com
9a139ddcd3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-03-25 14:55:41 +01:00
gbichot@quadita2.mysql.com
ead47f4701 WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero. 
This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4
are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
If slave fails in Execute_load_query_log_event::exec_event(),
don't delete the file (so that it's re-usable at next START SLAVE).
And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not
executed at all on the slave" (storing an Execute_load_query_log_event
to binlog, with its error code, instead of Delete_file_log_event).
 2005-03-25 14:51:17 +01: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
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
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
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
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