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
21717 commits 2790 branches 343 tags 1.7 GiB
Commit graph

21717 commits

This branch
This branch
All branches
Author SHA1 Message Date
pekka@mysql.com
42a641ffde ndb - make printSchemaFile available (compile manually) 2005-03-28 11:51:31 +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
8e028d2f88 item_func.cc: 
Post merge additional fix for DECIMAL type:
  Bugs: #9425: A user variable doesn't always have implicit coercibility
 2005-03-28 14:15:43 +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
dlenev@brandersnatch.localdomain
d4b20f4a86 Fix for bugs #5859 "DROP TABLE does not drop triggers" and 
#6559 "DROP DATABASE forgets to drop triggers".

If we drop table we should also drop all triggers associated with it.
To do this we have to check for existence of .TRG file when we are 
dropping table and delete it too.
 2005-03-27 16:15:21 +04:00
serg@serg.mylan
8207241882 merged 2005-03-26 20:15:18 +01: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
serg@serg.mylan
b100adf750 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-03-26 19:49:17 +01:00
serg@serg.mylan
72c9ac844b fixes for "backport wild_compare fix from 4.1 - bug#3924" 2005-03-26 19:46:42 +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
konstantin@mysql.com
eeeedd31b9 Manual merge 2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3 A fix for Bug#8226 "Cannot connect via shared memory": 
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts. 
Post review fixes.
 2005-03-26 01:21:52 +03:00
brian@zim.(none)
aa44d86235 fixed conflict making embedded server with libmysqld 2005-03-25 14:12:46 -08:00
brian@zim.(none)
013c2ed3be Fixing blackhole support in libmysqld 2005-03-25 14:09:19 -08: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)
89838b1ebc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into zim.(none):/home/brian/mysql/mysql-5.0
 2005-03-25 12:37:24 -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
jimw@mysql.com
dee535be63 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-25 10:51:08 -08:00
brian@zim.(none)
7b81a9fd4c Merging support for blackhole up to 5.0. 2005-03-25 10:36:58 -08:00
jimw@mysql.com
4f19826d80 Merge mysql.com:/home/jimw/my/mysql-4.1-9323 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-03-25 09:45:58 -08:00
jimw@mysql.com
4d2db80ee8 Merge mysql.com:/home/jimw/my/mysql-4.1-8499 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-03-25 09:45:30 -08:00
jimw@mysql.com
a13ef90ed1 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-25 09:42:18 -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
97b5cbba41 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
 2005-03-25 17:35:37 +04:00
bar@mysql.com
0a72d12deb mysql_client_test.c: 
Don't run GBK test if not GBK support was compiled.
 2005-03-25 17:30:51 +04: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
bbd27199b6 Bug#9317: Wrong count for tables in INFORMATION_SCHEMA(fix after review) 2005-03-25 13:31:29 +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
bar@eagle.intranet.mysql.r18.ru
2a1ad57732 Merge 2005-03-25 10:43:35 +04:00
petr@mysql.com
8139af1807 Post-review fixes for "!include" patch originating from Yahoo! (the whole patch is recommitted) 2005-03-25 04:13:30 +03: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
jimw@mysql.com
3b090265ee Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-24 10:53:51 -08:00
msvensson@neptunus.(none)
f953016a6f Removed faulty merge 2005-03-24 18:15:58 +01:00
msvensson@neptunus.(none)
66b31520e9 Manual merge 2005-03-24 18:11:13 +01:00