mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37039 commits 2780 branches 343 tags 1.6 GiB
Commit graph

37039 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@pippilotta.erinye.com
7eea7fff35 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-19 12:10:48 +02:00
df@pippilotta.erinye.com
f927d50509 try again. 2007-06-19 12:03:10 +02:00
msvensson@pilot.(none)
b8eee54d0b Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-19 11:34:54 +02:00
msvensson@pilot.(none)
e003d8ad3b Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
 2007-06-19 11:30:45 +02:00
msvensson@pilot.(none)
6c22726ebd Merge pilot.(none):/data/msvensson/mysql/wl3232/my41-wl3232 
into  pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
 2007-06-19 11:07:39 +02:00
msvensson@pilot.(none)
caebb719b2 WL#3232 mysqltest, enable --source $variables/<remaining_path_to_file> 
- Add test case for this already existing feature
 2007-06-19 11:06:02 +02:00
msvensson@pilot.(none)
46f0c05afc Bug#28769 Test case "innodb" fails with --skip-log-bin 
- Move binlog related tests to binlog_innodb.test
 - Remove "source include/have_log_bin.inc" from innodb.test
 2007-06-19 09:56:19 +02:00
holyfoot/hf@hfmain.(none)
438422d929 Merge mysql.com:/home/hf/work/29117/my41-29117 
into  mysql.com:/home/hf/work/29117/my50-29117
 2007-06-19 12:31:37 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
5a9d6856de Bug #29117 (init_file test crashes with embedded server) 
we use net->vio in my_net_local_init, but in the my_net_init
implementation we set it after the call, so work with unspecified
net->vio value
 2007-06-19 11:13:11 +05:00
dkatz@damien-katzs-computer.local
b7a2b41374 Bug #28921 Queries containing UDF functions are cached 
Fixed runtime to no longer allow the caching of queries with UDF calls.
 2007-06-18 17:55:12 -04:00
anozdrin/alik@ibm.
8c8ab0488e Fix typo in the patch for BUG#25411 on 24-Apr-2007. 2007-06-19 01:54:35 +04:00
dkatz@damien-katzs-computer.local
b89e4f9ef2 Bug #29053 SQL_CACHE in UNION causes non-deterministic functions to be cached 
Changed code to enforce that SQL_CACHE only in the first SELECT is used to turn on caching(as documented), but any SQL_NO_CACHE will turn off caching (not documented, but a useful behaviour, especially for machine generated queries). Added test cases to explicitly test the documented caching behaviour and test cases for the reported bug.
 2007-06-18 17:16:20 -04:00
tsmith@maint1.mysql.com
46772d36e2 Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/41 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-18 22:18:21 +02:00
tsmith@maint1.mysql.com
c658464813 Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-18 22:11:49 +02:00
tsmith@maint1.mysql.com
b6bd61d4d4 Merge maint1.mysql.com:/data/localhome/tsmith/bk/41 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
 2007-06-18 22:10:54 +02:00
joerg@trift2.
7e060d76b1 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-18 21:24:54 +02:00
joerg@trift2.
f0d63496b5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-18 21:20:03 +02:00
joerg@trift2.
57853e7dfe Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-18 21:16:09 +02:00
df@pippilotta.erinye.com
03d9ef1f19 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-18 20:23:35 +02:00
df@pippilotta.erinye.com
0ef1abae78 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-18 20:18:58 +02:00
df@pippilotta.erinye.com
1067f08ac9 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
 2007-06-18 20:18:26 +02:00
df@pippilotta.erinye.com
e9387bf5ce Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-18 20:15:27 +02:00
df@pippilotta.erinye.com
94a3e239c5 don't use bk cset in commit e-mails 2007-06-18 20:13:33 +02:00
joerg@trift2.
cf95b9e40e Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-18 19:44:58 +02:00
joerg@trift2.
1d09be3804 Merge trift2.:/MySQL/M41/clone-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-18 19:16:12 +02:00
gshchepa/uchum@gleb.loc
f015b4332b Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-06-18 18:45:55 +05:00
mhansson/martin@linux-st28.site
cc2d534ab1 Bug#28677: SELECT on missing column gives extra error 
The method select_insert::send_error does two things, it rolls back a statement
being executed and outputs an error message. But when a 
nonexistent column is referenced, an error message has been published already and
there is no need to publish another.
Fixed by moving all functionality beyond publishing an error message into 
select_insert::abort() and calling only that function.
 2007-06-18 16:35:01 +03:00
lars/lthalmann@dl145j.mysql.com
721c3ea5e5 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-18 12:05:17 +02:00
lars/lthalmann@dl145h.mysql.com
c5c624a752 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-18 12:02:39 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
135a98309c Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-06-18 12:02:03 +02:00
joerg@trift2.
b9cc9dbb03 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-18 11:25:26 +02:00
lars/lthalmann@dl145j.mysql.com
519e26e801 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-18 09:33:43 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bac8b8ab47 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-06-18 09:33:05 +02:00
svoj@june.mysql.com
491e471fb3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-06-18 11:47:47 +05:00
df@pippilotta.erinye.com
f369105aa4 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-18 07:42:13 +02:00
tomas@whalegate.ndb.mysql.com
4547957450 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 22:06:34 +02:00
tomas@whalegate.ndb.mysql.com
8a08ac40fb correct test and result 2007-06-17 22:04:01 +02:00
igor@olga.mysql.com
c27988f991 Post-merge fix 2007-06-17 11:43:49 -07:00
igor@olga.mysql.com
e81be02850 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27130
 2007-06-17 11:35:14 -07:00
igor@olga.mysql.com
63ab91090d Fixed bug #27130. If the third argument of the function SUBSTR was 
represented by an expression of the type UNSIGNED INT and this 
expression was evaluated to 0 then the function erroneously returned
the value of the first argument instead of an empty string. 

This problem was introduced by the patch for bug 10963.

The problem has been resolved by a proper modification of the code of
Item_func_substr::val_str.
 2007-06-17 11:23:19 -07:00
tomas@whalegate.ndb.mysql.com
8eb940de27 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-06-17 19:50:07 +02:00
tomas@whalegate.ndb.mysql.com
9c5183ace9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:28:01 +02:00
tomas@whalegate.ndb.mysql.com
9e3c14fae3 BUG#27640 
- correct test and result file
 2007-06-17 19:27:20 +02:00
tomas@whalegate.ndb.mysql.com
95ed412809 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 16:26:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
e63f983970 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28144/b28144.5.0
 2007-06-17 10:10:36 +05:00
gshchepa/uchum@gleb.loc
dac7ce2d12 bigint.test: 
Updated test case for bug #28625.
 2007-06-16 17:00:29 +05:00
istruewing@chilla.local
70600c15d8 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-16 11:34:21 +02:00
gshchepa/uchum@gleb.loc
3d4e75d583 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt-28625
 2007-06-16 13:49:26 +05:00
gshchepa/uchum@gleb.loc
8f09a374ea Fixed bug #28625: 
DECIMAL column was used instead of BIGINT for the minimal possible
BIGINT (-9223372036854775808).

The Item_func_neg::fix_length_and_dec has been adjusted to
to inherit the type of the argument in the case when it's an 
Item_int object whose value is equal to LONGLONG_MIN.
 2007-06-16 13:05:07 +05:00