mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20743 commits 2781 branches 343 tags 1.6 GiB
Commit graph

20743 commits

This branch
This branch
All branches
Author SHA1 Message Date
ramil/ram@mysql.com/myoffice.izhnet.ru
0d15e5e340 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b15195
 2006-07-14 16:58:51 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b57efe738a --{skip-}merge option added which allows the user to disable merge engine and 
to avoid the potential security problem.
(see bug #15195: Security Breach with MERGE table)
 2006-07-14 16:26:58 +05:00
holyfoot/hf@mysql.com/deer.(none)
9b687356ae Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1.16017
 2006-07-14 00:21:13 +05:00
holyfoot/hf@mysql.com/deer.(none)
eddaafb12b Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1.16017
 2006-07-13 22:32:18 +05:00
cmiller@zippy.(none)
b4c8f53661 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
 2006-07-13 13:10:59 -04:00
cmiller@zippy.(none)
fafc11205c Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
 2006-07-13 13:03:36 -04:00
igreenhoe/greenman@anubis.greendragongames.com
8e3d69d986 Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-15977
 2006-07-13 00:33:49 -07:00
tnurnberg@mysql.com/salvation.intern.azundris.com
4be51e1644 Bug#20432: mysql client interprets commands in comments 
do not look for client-specific commands while inside a multi-line comment.
we will allow multi-comments pretty much anywhere within SQL-statements,
but client-specific commands (help, use, print, ...) must be the first token
in the input.
 2006-07-13 09:04:06 +02:00
mkindahl@dl145k.mysql.com
0f070b0b32 Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-4.1 
into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-4.1-rpl
 2006-07-12 10:04:40 +02:00
cmiller@maint1.mysql.com
f83ad34329 Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-4.1
 2006-07-12 05:34:56 +02:00
cmiller@zippy.(none)
f12bc24ac6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
 2006-07-11 14:25:42 -04:00
cmiller@zippy.(none)
22485908ce Bug#20729: Bad date_format() call makes mysql server crash 
The problem is that the author used the wrong function to send a warning to the 
user about truncation of data.  push_warning() takes a constant string and 
push_warning_printf() takes a format and variable arguments to fill it.

Since the string we were complaining about contains percent characters, the 
printf() code interprets the "%Y" et c. that the user sends.  That's wrong, and
often causes a crash, especially if the date mentions seconds, "%s".

A alternate fix would be to use  push_warning_printf(..., "%s", warn_buff) .
 2006-07-11 13:06:29 -04:00
cmiller@zippy.(none)
faa575645f Merge zippy.(none):/home/cmiller/work/mysql/mysql-4.0__bug19006 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1
 2006-07-11 07:24:59 -04:00
pekka@orca.ndb.mysql.com
4893022ea6 ndb - bug#20847: non-debug compile fix 2006-07-10 12:05:51 +02:00
pekka@orca.ndb.mysql.com
6191c7db85 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my41 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-bug20847
 2006-07-10 11:06:21 +02:00
pekka@orca.ndb.mysql.com
c9db5f8063 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41
 2006-07-10 08:04:40 +02:00
aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi
fadbdf27c3 BUG#20919 temp tables closing fails when binlog is off 
closing temp tables through end_thread
had a flaw in binlog-off branch of close_temporary_tables where
next table to close was reset via table->next
 for (table= thd->temporary_tables; table; table= table->next)
which was wrong since the current table instance got destoyed at
	close_temporary(table, 1);

The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.
 2006-07-10 00:26:26 +03:00
ingo/mydev@chilla.local
987abbc253 Merge chilla.local:/home/mydev/mysql-4.1-bug19835 
into  chilla.local:/home/mydev/mysql-4.1-amerge
 2006-07-08 19:27:16 +02:00
ingo/mydev@chilla.local
d341ca941f Merge chilla.local:/home/mydev/mysql-4.1-bug17877 
into  chilla.local:/home/mydev/mysql-4.1-amerge
 2006-07-08 19:26:18 +02:00
ingo/mydev@chilla.local
065cdb030a Merge chilla.local:/home/mydev/mysql-4.1-bug14400 
into  chilla.local:/home/mydev/mysql-4.1-amerge
 2006-07-08 19:25:01 +02:00
ingo/mydev@chilla.local
eaa9350c90 Merge chilla.local:/home/mydev/mysql-4.1-bug11824 
into  chilla.local:/home/mydev/mysql-4.1-amerge
 2006-07-08 19:23:55 +02:00
cmiller@zippy.(none)
8ea01fbca8 Add a more reliable "getconf" test for Linuxthreads. The later trees should already 
have a better test (and so this should be null-merged there).

ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.
 2006-07-07 16:47:57 -04:00
pekka@mysql.com
7ed021f926 ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies 2006-07-07 10:57:22 +02:00
bar@mysql.com
2303077238 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b17647
 2006-07-07 12:17:00 +05:00
konstantin@bodhi.netgear
0db71aaf98 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.netgear:/opt/local/work/mysql-4.1-19399
 2006-07-07 00:01:05 +04:00
konstantin@bodhi.netgear
8e735d2c11 A fix and a test case for Bug#19399 "res 'Lost Connection' when 
dropping/creating tables".

The bug could lead to a crash when multi-delete statements were
prepared and used with temporary tables.

The bug was caused by lack of clean-up of multi-delete tables before
re-execution of a prepared statement. In a statement like
DELETE t1 FROM t1, t2 WHERE ... the first table list (t1) is
moved to lex->auxilliary_table_list and excluded from lex->query_tables
or select_lex->tables. Thus it was unaccessible to reinit_stmt_before_use
and not cleaned up before re-execution of a prepared statement.
 2006-07-06 23:59:04 +04:00
tomas@poseidon.ndb.mysql.com
cf71457319 Merge jonas@perch:src/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-07-06 16:06:19 +02:00
tomas@poseidon.ndb.mysql.com
aea2a9c788 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-07-06 16:03:22 +02:00
tomas@poseidon.ndb.mysql.com
b2ed2fd045 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-07-06 15:22:25 +02:00
tomas@poseidon.ndb.mysql.com
ec8771af69 backport of ndb DictCache fix 
- don't invalidate tables that are in state RETRIEVING
 2006-07-06 15:18:00 +02:00
jonas@perch.ndb.mysql.com
71d5a20d37 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-07-06 13:23:19 +02:00
pekka@mysql.com
949d69f9ba Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/space_old/pekka/ndb/version/my41
 2006-07-06 05:01:09 +02:00
acurtis@xiphis.org
86132d5d8f Bug#8706 
"temporary table with data directory option fails"
  myisam should not use user-specified table name when creating
  temporary tables and use generated connection specific real name.
  Test included.
 2006-07-05 17:18:59 -07:00
joerg@mysql.com
dbc1ca22a0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/bug20216-4.1
 2006-07-05 10:42:49 +02:00
pekka@clam.ndb.mysql.com
1adaad2b28 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my41
 2006-07-05 05:01:12 +02:00
ingo@mysql.com
40c103478d Merge mysql.com:/home/mydev/mysql-4.0-bug14400 
into  mysql.com:/home/mydev/mysql-4.1-bug14400
 2006-07-04 19:10:13 +02:00
pekka@clam.ndb.mysql.com
0f8ec3a8e8 ndb - bug#20847 fix (4.1) 2006-07-04 15:11:11 +02:00
bar@mysql.com
3855520138 WL#2928 Date Translation NRE 
(implemented by by Josh Chamas)
 2006-07-04 17:40:40 +05:00
pekka@clam.ndb.mysql.com
225f070788 pekka - checkout:get (4.1) 2006-07-04 13:51:35 +02:00
cmiller@zippy.(none)
5039184e83 Bug#19006: 4.0 valgrind problems (in test func_str) 
On exactly-sized Strings, the String::c_ptr() function peeked beyond the
end of the buffer, possibly into unititialized space to see whether the 
buffer was NUL-terminated.

In a place that did peek improperly, we now use a c_ptr_safe() function, 
which doesn't peek where it shouldn't.
 2006-07-01 14:31:52 -04:00
sergefp@mysql.com
61348cac0c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/psergey/mysql-4.1-bug16168-push
 2006-07-01 01:55:43 +04:00
monty@mysql.com
da935665fe Merge monty@192.168.0.9:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-06-30 19:15:18 +03:00
monty@mysql.com
445dfdc3a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-06-30 19:15:17 +03:00
tomas@poseidon.ndb.mysql.com
805551ead3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-30 18:15:16 +02:00
monty@mysql.com
54d22b286f Merge monty@192.168.0.9:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2006-06-30 18:44:15 +03:00
monty@mysql.com
2bec1b86bb Reverted wrong bug fix (Bug#11228) 2006-06-30 18:29:27 +03:00
tomas@poseidon.ndb.mysql.com
e61bfafaa9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-30 16:26:33 +02:00
tomas@poseidon.ndb.mysql.com
9f542ef0f4 adopted ndb handler code for tables without primary key and with unique index 
- added missing retrieval of hidden primary key
 2006-06-30 16:25:07 +02:00
jonas@perch.ndb.mysql.com
d09e065e82 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-06-30 11:25:14 +02:00
jonas@perch.ndb.mysql.com
827f25e0ce Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-06-30 11:16:39 +02:00