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

25704 commits

This branch
This branch
All branches
Author SHA1 Message Date
andrey@lmy004.
f479c3a48f Merge lmy004.:/work/mysql-5.0-clean into lmy004.:/work/mysql-5.0-ready5 2005-08-29 22:28:01 +02:00
andrey@lmy004.
251271f11b Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-clean
 2005-08-29 21:34:42 +02:00
konstantin@mysql.com
2c9db925fa Remove a no longer used header. 2005-08-29 23:32:47 +04:00
konstantin@mysql.com
344144ad14 Cleanup the instance manager code. 2005-08-29 23:29:35 +04:00
andrey@lmy004.
1668c45d30 fix for bug 12207 (alter table discard tablespace on MyISAM table 
causes ERROR 2013).
(all-in-one approved patch)
 2005-08-29 21:00:43 +02:00
bar@mysql.com
2f8a3bf747 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-08-29 22:17:13 +05:00
andrey@lmy004.
235cde55fb fix for bug #12841 
(Server crash on DO IFNULL(NULL,NULL)
(fixes also "SELECT CAST(IFNULL(NULL,NULL) as DECIMAL)" unreported
 crash)
(new revampled fix with suggestions from Igor)
 2005-08-29 15:45:03 +02:00
bar@mysql.com
96e0cb8cbf ctype_utf8.result, ctype_utf8.test, item.cc: 
Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
 2005-08-29 16:49:01 +05:00
bar@mysql.com
be470c38c6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12371
 2005-08-29 15:44:49 +05:00
andrey@lmy004.
d7d307fbdd Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-ready4
 2005-08-29 12:20:36 +02:00
andrey@lmy004.
ed0bac2116 fix for bug #12490 (all-in-one patch) 
(Packets out of order if calling HELP CONTENTS from Stored Procedure)
 2005-08-29 12:19:08 +02:00
kent@mysql.com
c019e40ff0 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-28 20:21:47 +02:00
kent@mysql.com
88af3ceb20 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-08-28 20:03:03 +02:00
kent@mysql.com
e2954b29a1 Makefile.am: 
Make ports configurable from environment for test
 2005-08-28 19:46:56 +02:00
sergefp@mysql.com
e4ce706cf9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-aug28-vg
 2005-08-28 20:26:42 +04:00
sergefp@mysql.com
e13f67cd05 Fix for valgrind warning: Check for thd->binlog_evt_union.unioned_events only if 
we were doing binlog union (i.e. need_binlog_call==TRUE)
 2005-08-28 20:25:53 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
d09e52c552 Applied a couple of Netware related patches. 2005-08-28 11:38:18 +03:00
igor@rurik.mysql.com
c19d2c1e89 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-27 16:30:39 -07:00
hf@deer.(none)
093789aabd gis.test corrected with Pem's wishes 2005-08-27 20:06:35 +05:00
hf@deer.(none)
23a51871d2 Merge deer.(none):/home/hf/work/mysql-5.0.11207 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-27 18:53:54 +05:00
hf@deer.(none)
b2a1a5e7f2 Addition to the fix for #11207 (SET GLOBAL TRANSACTION ISOLATION LEVEL) 2005-08-27 18:51:11 +05:00
hf@deer.(none)
63d6bc34e0 Merge deer.(none):/home/hf/work/mysql-5.0.10499 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-27 18:13:26 +05:00
hf@deer.(none)
418a7bfcde Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-27 18:10:46 +05:00
hf@deer.(none)
5b35789d12 Merge deer.(none):/home/hf/work/mysql-4.1.9645 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-08-27 18:06:09 +05:00
andrey@lmy004.
950a277988 retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database) 
(already approved)
 2005-08-27 12:29:36 +02:00
andrey@lmy004.
c9d9c74ac6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug11904
 2005-08-27 09:09:54 +02:00
acurtis@xiphis.org
bebe182885 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/usr/home/antony/work2/p3-bug9048.2
 2005-08-27 07:28:45 +01:00
acurtis@xiphis.org
23c19b21d6 Bug#9048 
"Creating a function with char binary IN parameter fails"
  Parse BINARY as part of type declaration, not as 
  a column attribute.
 2005-08-27 07:26:14 +01:00
igor@rurik.mysql.com
f93e7cc77a func_str.result, null.result: 
Corrected results after the fix for bug #12791.
func_test.result, func_test.test:
  Added test cases for bug #12791.
item_func.h, item_func.cc:
  Fixed bug #12791.
  Made LEAST/GREATES fully Oracle compliant.
  LEAST/GREATEST did not return NULL if only some
  arguments were NULLs. This did not comply with Oracle.
 2005-08-26 22:25:45 -07:00
kent@mysql.com
0c3c6f8003 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-27 02:05:35 +02:00
kent@mysql.com
057a98af4f unireg.h: 
Max index key length increased from 1024 to 3072
  for 64 bit builds.
 2005-08-27 01:50:38 +02:00
kent@mysql.com
fb690a5e04 2005-08-27 01:45:50 +02:00
sergefp@mysql.com
3e50dc3c4a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-rpl-bug
 2005-08-27 03:07:13 +04:00
kent@mysql.com
8dd0a47da0 mtr_timer.pl: 
Simplified and corrected mtr_timer_stop_all()
 2005-08-27 00:52:52 +02:00
sergefp@mysql.com
5f231a5f49 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-rpl-bug
 2005-08-27 02:34:05 +04:00
sergefp@mysql.com
ad9bfc251c Slightly amended Monty's SP replication code cleanup patch 2005-08-27 02:33:06 +04:00
patg@radha.local
3514fb4b4f Merge radha.local:/Users/patg/mysql-build/mysql-4.1 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.clean
 2005-08-26 21:08:28 +02:00
patg@radha.local
69114941cd typo to DBUG_RETURN fixed 2005-08-26 20:29:26 +02:00
serg@sergbook.mysql.com
e0a7676757 Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-08-26 21:37:44 +04:00
serg@sergbook.mysql.com
0a0fc47ce4 bad blind change fixed 2005-08-26 21:33:13 +04:00
kent@mysql.com
7a45cd2dad Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-26 18:45:16 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-08-26 15:56:52 +03:00
kent@mysql.com
abfbd9f9ba Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-26 14:32:38 +02:00
serg@sergbook.mysql.com
78a0585cea after merge fix 2005-08-26 15:28:08 +04:00
kent@mysql.com
207d159845 mysql-test-run.sh, mtr_report.pl: 
Corrected typo
 2005-08-26 12:37:35 +02:00
serg@sergbook.mysql.com
d591705e69 merged 2005-08-26 13:24:59 +04:00
serg@sergbook.mysql.com
4da4a66b64 Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-08-26 11:56:29 +04:00
andrey@lmy004.
7b1b3997a8 fix for bug #11904 (select statement, cursor, grouping wrong results) 2005-08-26 09:45:30 +02:00
patg@radha.local
6b4baf48a5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  radha.local:/Users/patg/mysql-build/mysql-4.1
 2005-08-26 03:14:56 +02:00
patg@radha.local
efff75ed1a ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878, per brian 2005-08-26 02:09:56 +02:00