mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31577 commits 2794 branches 343 tags 1.5 GiB
Commit graph

31577 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.local
2ab1e065e4 Fix compiler warnings in sql_udf.h: ISO C++ forbids casting 
between pointer to function and pointer to object.
 2006-07-09 13:03:51 +04:00
ingo/mydev@chilla.local
23c2570a5e Merge chilla.local:/home/mydev/mysql-4.0 
into  chilla.local:/home/mydev/mysql-4.0-bug14400
 2006-07-08 21:16:13 +02:00
kostja@bodhi.local
f1d949a856 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 21:45:02 +04: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
ingo/mydev@chilla.local
f631765a06 Merge chilla.local:/home/mydev/mysql-5.0--main 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-08 16:50:50 +02:00
kostja@bodhi.local
ff1947da1e A post-merge fix. 2006-07-08 04:07:43 +04:00
kostja@bodhi.local
a2c0cdd75b Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 02:30:07 +04:00
cmiller@maint1.mysql.com
8a7ae86ef2 Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-4.0__bug19006
 2006-07-07 23:00:33 +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
kostja@bodhi.local
96f4c10dde Cleanups: ignore more files. 2006-07-08 00:03:43 +04:00
kostja@bodhi.local
7bf73ac3e5 Merge bodhi.local:/opt/local/work/mysql-5.0-root 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-07-07 22:09:43 +04:00
kroki/tomash@mysql.com/moonlight.intranet
a81c1b27e5 Bug#19207: Final parenthesis omitted for CREATE INDEX in Stored Procedure 
Wrong criteria was used to distinguish the case when there was no
lookahead performed in the parser.  Bug affected only statements
ending in one-character token without any optional tail, like CREATE
INDEX and CALL.
 2006-07-07 21:24:54 +04:00
gkodinov/kgeorge@mysql.com/macbook.gmz
ece5fff44e Bug #20569 Garbage in DECIMAL results from some mathematical functions 
* portability fix: moved the macro call after the C declaration
 2006-07-07 17:27:11 +03:00
bar@mysql.com
433e7fb8db Merge mysql.com:/usr/home/bar/autopush/mysql-5.0.b10979 
into  mysql.com:/usr/home/bar/mysql-5.0-kt
 2006-07-07 17:35:02 +05:00
bar@mysql.com
ae03358bec Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0-kt
 2006-07-07 17:32:26 +05:00
bar@myoffice.izhnet.ru
eec0355de2 func_str.result, func_str.test: 
Adding test case.
item_strfunc.cc:
  bug#11728 string function LEFT, strange undocumented behaviour
  Fixing LEFT and RIGHT return NULL if the second
  argument is NULL.
 2006-07-07 17:06:30 +05:00
pekka@mysql.com/orca.ndb.mysql.com
c9bc03c3cd Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847 
into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847
 2006-07-07 13:40:47 +02:00
bar@mysql.com
a8844cb22a Merge mysql.com:/usr/home/bar/mysql-4.1.b7192 
into  mysql.com:/usr/home/bar/mysql-5.0-kt
 2006-07-07 16:27:38 +05:00
bar@mysql.com
7939a200e4 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/autopush/mysql-5.0.b10979
 2006-07-07 15:51:30 +05: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
bar@mysql.com
c86acb53fa Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b10979
 2006-07-07 12:14:12 +05:00
knielsen@ymer.(none)
31ddb04105 Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951 
into  ymer.(none):/usr/local/mysql/tmp-5.0
 2006-07-06 23:52:05 +02:00
knielsen@ymer.(none)
5ea51287d6 BUG#19951: Race conditions in test wait_timeout. 
Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.
 2006-07-06 23:49:09 +02:00
igor@olga.mysql.com
f829f210b8 Added a test case with views for bug 18243 (see also func_str.test). 2006-07-06 14:41:01 -07:00
igor@olga.mysql.com
f6d6ac1e0f Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-06 13:40:08 -07: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
ingo@chilla.local
b900484346 Merge chilla.local:/home/mydev/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-06 21:59:48 +02: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
igor@olga.mysql.com
6e1c8ad830 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-4.1-opt
 2006-07-06 11:38:48 -07:00
igor@olga.mysql.com
0e3d2dafd6 Fixed bug #18243. 
The implementation of the method Item_func_reverse::val_str
for the REVERSE function modified the argument of the function.
This led to wrong results for expressions that contained
REVERSE(ref) if ref occurred somewhere else in the expressions.
 2006-07-06 11:11:49 -07:00
tomas@poseidon.ndb.mysql.com
73064141f6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 20:09:25 +02:00
ingo@chilla.local
f031de4f9e Merge chilla.local:/home/mydev/mysql-5.0-bug16218 
into  chilla.local:/home/mydev/mysql-5.0-ateam
 2006-07-06 19:38:10 +02:00
ingo@chilla.local
591d461d95 Merge chilla.local:/home/mydev/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-bug16218
 2006-07-06 19:36:07 +02:00
tomas@poseidon.ndb.mysql.com
8816f98036 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 19:03:33 +02:00
tomas@poseidon.ndb.mysql.com
4199719438 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 18:50:44 +02: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
joerg@trift2.
a873811ae8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into trift2.:/M50/merge-5.0
 2006-07-06 16:03:02 +02:00
tomas@poseidon.ndb.mysql.com
27a8cade86 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 16:03:01 +02:00
ingo@chilla.local
518fcc8f80 Merge chilla.local:/home/mydev/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-ateam
 2006-07-06 15:59:03 +02:00
tomas@poseidon.ndb.mysql.com
e68194dcc0 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 15:23:35 +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
9944e41f6e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-07-06 15:20:22 +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
guilhem@gbichot3.local
3365337cef Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  gbichot3.local:/home/mysql_src/mysql-5.0
 2006-07-06 14:46:52 +02:00
guilhem@gbichot3.local
dd84ef1b8a Merge gbichot3.local:/home/mysql_src/mysql-5.0-20524 
into  gbichot3.local:/home/mysql_src/mysql-5.0
 2006-07-06 14:42:47 +02:00