mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25015 commits 2793 branches 343 tags 1.7 GiB
Commit graph

11936 commits

Author SHA1 Message Date
ndbdev@dl145b.mysql.com
f5f56e4995 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-21 16:49:03 +02:00
gluh@mysql.com
d0086f7db0 Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-07-21 17:55:16 +05:00
bar@mysql.com
6a97af8a02 Bug#11216: 'show character set' describes latin1 incorrectly 
Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.
 2005-07-21 16:05:19 +05:00
ndbdev@dl145b.mysql.com
f4fe2c3b71 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-21 08:06:26 +02:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
5cdaf46362 Fix merge mistake 2005-07-21 01:38:42 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6026054ead Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-07-21 01:29:57 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ac6623f08f Fix merge 2005-07-20 22:30:34 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9663b9a974 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
 2005-07-20 21:58:33 -04:00
tulin@dl145b.mysql.com
98a26f0c3f merge 2005-07-21 00:04:18 +02:00
mronstrom@mysql.com
4cb963439a Bug #10600 After review fixes 2005-07-20 21:19:01 +02:00
jimw@mysql.com
69a3209275 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-20 10:31:33 -07:00
jimw@mysql.com
93ae805db3 Fix date conversion on 32-bit machines. 2005-07-20 10:16:43 -07:00
tomas@poseidon.ndb.mysql.com
6ca09e8b8f Bug #12055 NDB temp tables created by ALTER TABLE are usable 
- do not discover temporary files and make them visible
 2005-07-20 18:40:55 +02:00
konstantin@mysql.com
21957c423e Implement MySQL framework to support consistent read views in 
cursors. This should fix Bug#11813 when InnoDB part is in 
(tested with a draft patch).
The idea of the patch is that if a storage engine supports
consistent read views, we open one when open a cursor,
set is as the active view when fetch from the cursor, and close
together with cursor close.
 2005-07-20 20:02:36 +04:00
tulin@dl145b.mysql.com
6176a4acf6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-20 14:48:34 +02:00
konstantin@mysql.com
4570ace8fb Fix warnings/compilation failures reported by Jan Lindstrom 2005-07-20 14:17:06 +04:00
tulin@dl145b.mysql.com
bf6e3f9aa8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-20 07:53:10 +02:00
jimw@mysql.com
d7fbff3ec5 Merge mysql.com:/home/jimw/my/mysql-5.0-5906 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:34 -07:00
jimw@mysql.com
39efcdcf7c Merge mysql.com:/home/jimw/my/mysql-5.0-11822 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:33 -07:00
jimw@mysql.com
2a06e5756e Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:32 -07:00
evgen@moonbone.local
ef1d27e02a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11760
 2005-07-20 06:59:31 +04:00
evgen@moonbone.local
6b25219fea Fix bug #11760 Typo in Item_func_add_time::print() results in NULLs returned 
by subtime() in view

Item_func_add_time::print() were printing arg[0] instead of arg[1] which
results in wrongly created view. Functions addtime() and subtime were
affected by this bug.
 2005-07-20 06:55:51 +04:00
jimw@mysql.com
63c6ece728 Cleanups after merge from 4.1. 2005-07-19 16:32:38 -07:00
tulin@dl145b.mysql.com
7a37e58135 merge 2005-07-20 00:40:49 +02:00
konstantin@mysql.com
5f5e10ed25 Fix a compilation failure. 2005-07-20 01:17:16 +04:00
elliot@mysql.com
7e4179ea02 ha_ndbcluster.cc: 
BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
 2005-07-19 22:04:43 +02:00
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02:00
konstantin@mysql.com
e3af1b6ec6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kostja/mysql/mysql-5.0-10760-new
 2005-07-19 22:22:12 +04:00
konstantin@mysql.com
14344b658a A fix and a test case for Bug#10760 and complementary cleanups. 
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same 
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
 2005-07-19 22:21:12 +04:00
jimw@mysql.com
80c1c6b33f Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 11:05:49 -07:00
dlenev@mysql.com
b141437ad3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-tn
 2005-07-19 20:55:09 +04:00
monty@mishka.local
292aefeeca Fixed some test cases that was not forgotten in a recent patch 2005-07-19 19:47:54 +03:00
monty@mishka.local
29d9aa65f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-07-19 19:28:26 +03:00
monty@mishka.local
7e83d09ce7 Simple fixes during review of new code 2005-07-19 19:25:05 +03:00
dlenev@mysql.com
8a3e723b74 Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 
"Triggers have the wrong namespace"
  "Triggers: duplicate names allowed"
  "Triggers: CREATE TRIGGER does not accept fully qualified names"
  "SHOW TRIGGERS"
 2005-07-19 20:06:49 +04:00
ingo@mysql.com
ec15dda2bf Bug#10932 - Building server with key limit of 128, makes test cases fail 
This patch allows to configure MyISAM for 128 indexes per table.
The main problem is the key_map, wich is implemented as an ulonglong.
To get rid of the limit and keep the efficient and flexible
implementation, the highest bit is now used for all upper keys.
This means that the lower keys can be disabled and enabled 
individually as usual and the high keys can only be disabled and
enabled as a block. That way the existing test suite is still
applicable, while more keys work, though slightly less efficient.
To really get more than 64 keys, some defines need to be changed.
Another patch will address this.
 2005-07-19 14:13:56 +02:00
gluh@eagle.intranet.mysql.r18.ru
d1bc1b7c0e Fix for bug#11057 information_schema: columns table has some questionable contents 
fixed BLOB, TEXT(wrong maximum length), BIT and integer types(wrong numeric_precision value)
 2005-07-19 14:30:32 +05:00
gluh@eagle.intranet.mysql.r18.ru
d59ff2764c Bug#11577 'show procedure/function status' doesn't work for user with limited access 
changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines
 2005-07-19 13:49:43 +05:00
elliot@mysql.com
98dc8e3242 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0 
into  mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
 2005-07-18 22:27:20 -04:00
patg@radha.local
164255fc81 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0
 2005-07-19 03:18:54 +02:00
patg@radha.local
e2d8644053 Eric's implentation of OPTIMIZE TABLE and REPAIR TABLE, 
as well as changes to the test.
 2005-07-19 03:04:51 +02:00
jimw@mysql.com
aff38d8659 Handle systems where 127.0.0.1 doesn't always map to 'localhost' 
first. (Bug #11822)
 2005-07-18 17:00:37 -07:00
jimw@mysql.com
dd2f631ec4 Fix number to date conversion so it always honors the NO_ZERO_DATE, 
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906)
 2005-07-18 16:12:44 -07:00
mronstrom@mysql.com
2d23c691f7 Bug #10600 
remove_table_from_cache fails to signal other thread and gets
blocked when other thread also gets blocked
 2005-07-19 00:29:19 +02:00
elliot@mysql.com
22be12ab86 BUG#11567 Fixed binlog tests on windows. 2005-07-18 17:47:26 -04:00
konstantin@mysql.com
52b8928b09 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root 
into  mysql.com:/home/kostja/mysql/mysql-5.0-merge
 2005-07-19 00:55:37 +04:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-18 19:03:01 +03:00
evgen@moonbone.local
e75e566469 Merge moonbone.local:/work/mysql-4.1-bug-11868 
into moonbone.local:/work/mysql-5.0-bug-11482
 2005-07-18 19:37:42 +04:00
reggie@linux.site
8f605428cb Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  linux.site:/home/reggie/bk/bug7142
 2005-07-18 08:03:59 -06:00
mronstrom@mysql.com
6389639d84 Patch to get prepared statements to properly handle 
partitioning
 2005-07-18 15:23:26 +02:00