database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
37,360 Commits 3,280 Branches 1,098 Tags
49eb41e09dba1b5136e8a94a86d66ad5b3c46d37
Commit Graph

13579 Commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
fb52fe5cf5 fix compile error on hp-ux setenv->putenv 
print slave port as well
 2006-01-13 17:44:37 +01:00
anozdrin@mysql.com
b1705ae5c4 Merge BUG#15110 from 5.0 into 5.1. 
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
 2006-01-13 19:09:27 +03:00
evgen@moonbone.local
ceb1932984 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/15347-bug-5.0-mysql
 2006-01-13 18:42:15 +03:00
gvb@phoenix.(none)
45db1c24b0 fix for bug#15828 
problem was not checking 2nd parameter of str_to_date against NULL
 2006-01-13 14:42:46 +01:00
evgen@moonbone.local
cea01c7387 Merge 2006-01-13 16:27:38 +03:00
bar@mysql.com
0e2fac2d8c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-13 17:21:38 +04:00
bar@mysql.com
949aced164 Merge mysql.com:/usr/home/bar/mysql-4.1.b15377 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-13 16:39:33 +04:00
tomas@poseidon.ndb.mysql.com
21008ab2e8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-01-13 13:02:20 +01:00
tomas@poseidon.ndb.mysql.com
fff1caa0be enabled test 
added missing debug_return
 2006-01-13 13:01:19 +01:00
evgen@moonbone.local
02570c20bf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/15538-bug-5.0-mysql
 2006-01-13 14:30:20 +03:00
bar@mysql.com
78e93fbbcf Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15377
 2006-01-13 14:22:53 +04:00
bar@mysql.com
b061cacb0b Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15377
 2006-01-13 14:16:16 +04:00
evgen@moonbone.local
8dbedc9ffd Merge 2006-01-13 12:13:50 +03:00
jonas@perch.ndb.mysql.com
d033448fa1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-01-13 09:22:02 +01:00
tomas@poseidon.ndb.mysql.com
1246d2a264 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/v7
 2006-01-13 07:50:45 +01:00
jonas@perch.ndb.mysql.com
8c41e2ae2c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-01-13 07:31:35 +01:00
brian@zim.tangent.org
8651cee8ef New support for ignoring blobs during scans. We now seek past them if we determine that they are of no use to us. This is a big save in tables with blobs. Far less memory overhead and the seek is quite a bit faster. 2006-01-12 20:32:40 -08:00
tomas@poseidon.ndb.mysql.com
e648a8fe52 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/v7
 2006-01-13 03:17:09 +01:00
tomas@poseidon.ndb.mysql.com
46b867757a updated mysql-test-run.pl to adjust to ndb replication testing 2006-01-13 03:13:58 +01:00
jmiller@mysql.com
9a0f29562e New test code fro CDD 2006-01-12 23:57:01 +01:00
dlenev@mysql.com
f9ea947bdc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
 2006-01-13 01:56:57 +03:00
dlenev@mysql.com
d14e701446 Fix for bug #12198 "Temporary table aliasing does not work inside stored 
functions".

We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
 2006-01-13 01:51:56 +03:00
brian@zim.tangent.org
be993c9a23 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/slap-5.1
 2006-01-12 13:31:12 -08:00
brian@zim.tangent.org
0f50bfa486 Fixed bug #16167 
Added --use-threads option for porting to Windows.
 2006-01-12 12:27:25 -08:00
ingo@mysql.com
acb31ce696 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563
 2006-01-12 20:21:20 +01:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4 wl2325 wl2324 2006-01-12 19:51:02 +01:00
msvensson@neptunus.(none)
9772563d78 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-01-12 18:47:16 +01:00
msvensson@neptunus.(none)
3d478a6d9f Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-01-12 18:45:49 +01:00
msvensson@neptunus.(none)
fac966560a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:25:51 +01:00
msvensson@neptunus.(none)
0dffbdfb61 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:23:44 +01:00
msvensson@neptunus.(none)
254e626a56 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
 2006-01-12 18:21:35 +01:00
msvensson@neptunus.(none)
7f919f9ef7 Use "test ! -s" to check that file does not exist 2006-01-12 18:19:57 +01:00
ingo@mysql.com
54c1827245 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563
 2006-01-12 18:06:12 +01:00
ingo@mysql.com
01d8c6678e Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563
 2006-01-12 17:29:14 +01:00
jmiller@mysql.com
340e0c0738 rpl_sp.test, disabled.def, rpl_stm_mystery22.test: 
Test cleanip per lars
.del-rpl_row_sp000.result~2b24650b123e20a9:
  Delete: mysql-test/r/rpl_row_sp000.result
.del-rpl_row_sp000.test~645e2807516682b6:
  Delete: mysql-test/t/rpl_row_sp000.test
.del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
  Delete: mysql-test/t/rpl_row_sp000-slave.opt
.del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
  Delete: mysql-test/t/rpl_row_sp000-master.opt
rpl_sp.result:
  Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
rpl_sp-master.opt:
  Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
rpl_sp-slave.opt:
  Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
rpl_sp.test:
  Rename: mysql-test/t/rpl_stm_sp.test -> mysql-test/t/rpl_sp.test
 2006-01-12 17:05:25 +01:00
jmiller@mysql.com
e4ecc367eb ndb_dd_ddl.test: 
Added requested changes to test.
 2006-01-12 14:31:42 +01:00
ingo@mysql.com
a1dd235f96 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563
 2006-01-12 14:29:17 +01:00
jmiller@mysql.com
2158cbded8 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-01-12 13:34:58 +01:00
bar@mysql.com
6301568290 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 16:07:06 +04:00
bar@mysql.com
832148ded2 ctype_utf8.result: 
After merge fix:
  fixing order of results.
 2006-01-12 13:08:49 +04:00
ingo@mysql.com
16437321cb WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX 
NDB cluster is not fully supported. This will be added with
WL 1892 (NDB Handler: Add support for CREATE/DROP INDEX).
Some preparatory code for this is already present though.
A change for the "duplicate key" error message is planned
for another changeset.
 2006-01-12 10:05:07 +01:00
sergefp@mysql.com
40b7fab55d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
 2006-01-12 11:55:34 +03:00
sergefp@mysql.com
e40759e370 BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into 
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
 2006-01-12 10:48:27 +03:00
bar@mysql.com
0e9c8395c7 Merge mysql.com:/usr/home/bar/mysql-4.1.b15581 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15581
 2006-01-12 11:13:34 +04:00
brian@zim.tangent.org
c30f88f86d Added bitfield support and a test for it. 
Archive uses native row format, so honestly this is just the change in a flag.
 2006-01-11 21:16:51 -08:00
anozdrin@mysql.com
dae00c191f Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem. 2006-01-12 03:02:52 +03:00
evgen@moonbone.local
41ef34356c Fixed bug #15538: unchecked table absence caused server crash. 
Absence of table in left part of LEFT/RIGHT join wasn't checked before
name resolution which resulted in NULL dereferencing and server crash.

Modified rules: 
"table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer 
JOIN_SYM table_ref"
NULL check is moved before push_new_name_resolution_context()
 2006-01-11 23:39:09 +03:00
evgen@moonbone.local
3e23d458f9 Fixed bug #15347: Wrong result of subselect when records cache and set 
functions are involved.

When subselect is a join with set functions and no record have been found in
it, end_send_group() sets null_row for all tables in order aggregate functions 
to calculate their values correctly. Normally this null_row flag is cleared for 
each table in sub_select(), but flush_cached_records() doesn't do so.
Due to this all fields from the table processed by flush_cached_records() are 
always evaluated as nulls and whole select produces wrong result.

flush_cached_records() now clears null_row flag at the very beginning.
 2006-01-11 23:16:21 +03:00
brian@zim.(none)
605f3ab586 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/archive-5.1
 2006-01-11 12:06:30 -08:00