mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
29818 commits 2779 branches 343 tags 1.6 GiB
Commit graph

29818 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot@deer.(none)
318aba9db1 bug #18455 (embedded server Win32 build) 2006-04-26 15:58:27 +05:00
stewart@mysql.com
ebbff7ee3f BUG#19340 small leak in ndbd 
small cleanup fixes in kernel/vm/Configuration
 2006-04-25 10:04:46 -07:00
mskold@mysql.com
051e6ac994 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-25 12:46:40 +02:00
mskold@mysql.com
435c1028fc Fixed memleak detected by valgrind 2006-04-25 12:40:31 +02:00
knielsen@mysql.com
eb53a5b02c Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0-mtr-fix 
into  mysql.com:/data0/knielsen/mysql-5.0-mtr-fix
 2006-04-24 23:56:36 +02:00
knielsen@mysql.com
854cbe88b6 Merge mysql.com:/usr/local/mysql/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix
 2006-04-24 23:51:47 +02:00
knielsen@mysql.com
17a80c9da4 Fix typo in mysql-test-run.pl (not caught by aotupush since it uses mysql-test-run.sh). 2006-04-24 15:34:01 +02:00
knielsen@mysql.com
afeb3c06f7 Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-4.1-mtr-fix 
into  mysql.com:/data0/knielsen/mysql-4.1-mtr-fix
 2006-04-24 10:28:31 +02:00
joerg@mysql.com
5ec0af4acb Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2006-04-24 09:39:28 +02:00
ramil@production.mysql.com
f7394c26f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b17896
 2006-04-24 08:01:10 +02:00
paul@polar.kitebird.com
497b91d60d Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2006-04-23 19:52:01 -05:00
paul@polar.kitebird.com
dfbdef876a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2006-04-23 19:50:03 -05:00
paul@polar.kitebird.com
5907ce40e8 Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2006-04-23 19:49:05 -05:00
paul@polar.kitebird.com
3cd7e135d4 myisam_ftdump.c: 
myisam_ftdump options: --help first, then rest in
  lexical order.
 2006-04-23 19:26:56 -05:00
aelkin@mysql.com
ac47502164 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-04-23 21:30:04 +03:00
aelkin@mysql.com
a8368fde52 Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/5.0-bug17263-temp_drop 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-04-23 20:06:30 +03:00
aelkin@mysql.com
b56d36dd30 Bug#17263 temporary tables and replication 
The fix refines the algorithm of generating DROPs for binlog. 
Temp tables with common pseudo_thread_id are clustered into one query. 
Consequently one replication event per pseudo_thread_id is generated.
 2006-04-23 19:59:43 +03:00
aelkin@mysql.com
19f134e40b Bug#17263: incorrect DROP query in temporary tables replication 
accounting non-ai32 in tmpkeyval. This changeset is supposed to be specifically for 4.1.
Another changeset is going to push into 5.
 2006-04-23 19:42:26 +03:00
aelkin@mysql.com
28fe756a3d manual merge use local 2006-04-23 12:32:41 +03:00
aelkin@mysql.com
b2b725dba0 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-04-23 12:32:40 +03:00
aelkin@mysql.com
c5219d0d67 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-04-23 12:32:39 +03:00
konstantin@mysql.com
8301e6f625 Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-23 13:32:38 +04:00
aivanov@mysql.com
4fba67933d Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0
 2006-04-23 13:32:37 +04:00
aelkin@mysql.com
a4ff312037 Bug#17263 temporary tables and replication 
Backporting a changeset made for 5.0. Comments from there:

  The fix refines the algorithm of generating DROPs for binlog.
  Temp tables with common pseudo_thread_id are clustered into one query.
  Consequently one replication event per pseudo_thread_id is generated.
 2006-04-23 12:18:57 +03:00
aivanov@mysql.com
50e8e58c8a Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/alexi/innodb/mysql-4.1
 2006-04-23 13:18:56 +04:00
dlenev@mysql.com
5e7076ce95 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg15153-2
 2006-04-22 11:56:15 +04:00
dlenev@mysql.com
c77d5a0ed1 Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs". 
Error was emitted when one tried to select information from view which used
merge algorithm and which also had CONVERT_TZ() function in its select list.

This bug was caused by wrong assumption that global table list for view
which is handled using merge algorithm begins from tables belonging to
the main select of this view. Nowadays the above assumption is not true only
when one uses convert_tz() function in view's select list, but in future
other cases may be added (for example we may support merging of views
with subqueries in select list one day). Relying on this false assumption
led to the usage of wrong table list for field lookups and therefor errors. 

With this fix we explicitly use pointer to the beginning of main select's
table list.
 2006-04-22 11:54:25 +04:00
joerg@mysql.com
19b0b3c62b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2006-04-21 22:09:21 +02:00
kent@mysql.com
806564d754 innodb_unsafe_binlog-master.opt: 
Make InnoDB option "loose", as the server might be
  started with this option just to find out the test
  is to be skipped in the configuration (bug#17359)
 2006-04-21 20:24:52 +02:00
kent@mysql.com
1472ed2061 Merge 2006-04-21 20:04:13 +02:00
igor@rurik.mysql.com
4b21910b0d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-04-21 09:46:47 -07:00
tomas@poseidon.ndb.mysql.com
6013082977 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-21 18:31:17 +02:00
igor@rurik.mysql.com
510ab81362 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  rurik.mysql.com:/home/igor/mysql-4.1
 2006-04-21 08:22:03 -07:00
igor@rurik.mysql.com
639e875032 Post merge fixes 2006-04-21 08:19:38 -07:00
kroki@mysql.com
b0c1e49a11 Bug#15728: LAST_INSERT_ID function inside a stored function returns 0 
Do not reset value of LAST_INSERT_ID() in sub-statement.
 2006-04-21 18:55:04 +04:00
joerg@mysql.com
668d083653 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2006-04-21 15:20:10 +02:00
pem@mysql.com
8532fa29f4 Post-push fix for BUG#18344: DROP DATABASE does not drop associated routines 
Fixed windows compile error in sql/sp.cc (missing cast to byte*)
 2006-04-21 14:30:44 +02:00
tomas@poseidon.ndb.mysql.com
77e3fc3a09 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-21 14:02:21 +02:00
ramil@production.mysql.com
aed861fd86 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18643
 2006-04-21 13:56:40 +02:00
tomas@poseidon.ndb.mysql.com
f071779791 Bug #17230 Can't change character-sets-dir for ndbd 2006-04-21 13:53:48 +02:00
mskold@mysql.com
09d4105f7d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-21 12:16:17 +02:00
pem@mysql.com
8c5ae25ff5 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18344/mysql-5.0-runtime
 2006-04-21 10:22:06 +02:00
mskold@mysql.com
472aeeb9df Fix for bug#19088: NDBAPI: Segfault in NdbIndexScanOperation::setBound(...) 2006-04-21 10:17:55 +02:00
msvensson@neptunus.(none)
e984716c01 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/my50-bug19190
 2006-04-21 10:17:16 +02:00
igor@rurik.mysql.com
37ac782206 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-21 00:36:20 -07:00
ramil@mysql.com
b9fc8e1f69 Bug #17896: MIN of CASE WHEN returns non-minimum value! 
- after review fixes
 2006-04-21 11:48:00 +05:00
igor@rurik.mysql.com
fd3e924164 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-04-20 22:34:37 -07:00
igor@rurik.mysql.com
fc7514151f Fixed bug #18767. 
The bug caused wrong result sets for union constructs of the form
(SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
For such queries order lists were concatenated and limit clause was
completely neglected.
 2006-04-20 22:15:38 -07:00
aivanov@mysql.com
364621abc0 Restoring changes erroneously removed by applying 
the innodb-5.0-ss476 snapshot.
 2006-04-21 01:37:31 +04:00
aivanov@mysql.com
25d9a75d12 Applied innodb-5.0-ss476 snapshot. 
Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
 Also, fix memory leaks in row_create_table_for_mysql() in rare
 corner cases.
 2006-04-21 01:07:37 +04:00