database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
28,811 Commits 3,346 Branches 1,099 Tags
7a490207aaa95f8bf78cab2bbae23abae6faa7bc
Commit Graph

13724 Commits

Author SHA1 Message Date
pekka@mysql.com
14249f23ed Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 21:52:56 +01:00
gunnar@mysql.com.
f6590a3b89 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0
 2006-02-07 20:50:28 +01:00
pekka@mysql.com
05353723f0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 20:04:54 +01:00
pekka@mysql.com
9aa06f3bc1 ndb - bug#15918 fix 2006-02-07 19:57:31 +01:00
gunnar@mysql.com.
a0b0cb5551 Merge mysql.com.:/data/BK/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0_8461_b
 2006-02-07 17:15:12 +01:00
gunnar@mysql.com.
001224c09d item_func.cc: 
fix for bug#8461

  BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
  Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
  Changed the integer routine to work on integers only.
  This bug affects 4.1, 5.0 and 5.1
  Fixing in 4.1 will need to change the routine to handle different types individually.
  5.0 did had different routines for different types already just the INTEGER routine was bad.
 2006-02-07 13:26:35 +01:00
svoj@april.(none)
328b59a5ed Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
 2006-02-07 15:30:32 +04:00
svoj@april.(none)
0488462a58 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
 2006-02-07 14:49:57 +04:00
tomas@poseidon.ndb.mysql.com
6fe11666fd Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-07 11:31:52 +01:00
tomas@poseidon.ndb.mysql.com
06a57659d8 Bug #17081 "LOAD DATA INFILE" may not load all the data 2006-02-07 11:30:42 +01:00
svoj@april.(none)
91296df576 Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
 2006-02-07 13:49:55 +04:00
svoj@april.(none)
a67d8f9043 Merge april.(none):/home/svoj/devel/mysql/BUG14496/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
 2006-02-07 13:49:03 +04:00
tomas@poseidon.ndb.mysql.com
c445b29d4d ndb, transaction should be refgistred even if m_transaction_on is not set 2006-02-07 00:26:47 +01:00
tomas@poseidon.ndb.mysql.com
3f6671d72a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-07 00:06:28 +01:00
tomas@poseidon.ndb.mysql.com
5bbb5c29b7 Bug #17154 load data infile of char values into a table of char(PK) hangs 
Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data
 2006-02-07 00:03:39 +01:00
igor@rurik.mysql.com
b25b4e9b5e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-06 11:40:39 -08:00
igor@rurik.mysql.com
3af0eabc7f Fixed bug #16203. 
If check_quick_select returns non-empty range then the function cost_group_min_max
cannot return 0 as an estimate of the number of retrieved records.
Yet the function erroneously returned 0 as the estimate in some situations.
 2006-02-06 11:35:13 -08:00
pem@mysql.com
c289a3b60e Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
 2006-02-06 17:58:15 +01:00
pem@mysql.com
62d2511df5 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
 2006-02-06 16:07:13 +01:00
pem@mysql.com
2d340a875c Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16568/mysql-5.0
 2006-02-06 14:09:14 +01:00
svoj@april.(none)
7c76ae4c13 BUG#16893: Crash in test 'fulltext_order_by' 
Fixed that fulltext query + union results in unexpected behaviour.
 2006-02-03 14:09:33 +04:00
igor@rurik.mysql.com
7b58b91fe4 Fixes after manual merge 2006-02-02 23:56:08 -08:00
igor@rurik.mysql.com
f61517d60b Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 21:23:36 -08:00
igor@rurik.mysql.com
4abab51c24 Post-review fix for bug #14927. 2006-02-02 20:37:58 -08:00
igor@rurik.mysql.com
cc2fae5244 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-02-02 17:56:05 -08:00
igor@rurik.mysql.com
b32ce5ac79 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 13:47:21 -08:00
konstantin@mysql.com
303ad65fb2 Post-merge fixes. 2006-02-03 00:07:36 +03:00
konstantin@mysql.com
98091b152a Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-02-02 18:17:18 +03:00
pem@mysql.com
c5abd52a47 Minor fix for BUG#16303 in sp.cc: Simplified code in sp_routine_exists_in_table(). 
(No change of functionality)
 2006-02-02 15:37:29 +01:00
igor@rurik.mysql.com
86606615ab Fixed bug #16382. 
When an ambiguous field name is used in a group by clause a warning is issued
in the find_order_in_list function by a call to push_warning_printf.
An expression that was not always valid was passed to this call as the field
name parameter.
 2006-02-01 20:43:43 -08:00
svoj@april.(none)
332be5bdd9 BUG#14496: Crash or strange results with prepared statement, 
MATCH and FULLTEXT
Fixed that fulltext query using PS results in unexpected behaviour
when executed 2 or more times.
 2006-02-01 20:40:12 +04:00
pem@mysql.com
526a974460 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15011/mysql-5.0
 2006-02-01 16:01:22 +01:00
pem@mysql.com
30d1426675 Post-review fix for BUG#15011. 
Added comments.
 2006-02-01 16:00:11 +01:00
igor@rurik.mysql.com
d6370b48a7 FIxed bug #14927. 
A query with a group by and having clauses could return a wrong
result set if the having condition contained a constant conjunct 
evaluated to FALSE.
It happened because the pushdown condition for table with
grouping columns lost its constant conjuncts.
Pushdown conditions are always built by the function make_cond_for_table
that ignores constant conjuncts. This is apparently not correct when
constant false conjuncts are present.
 2006-01-31 21:48:32 -08:00
aivanov@mysql.com
bba8155516 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss162
 2006-01-31 21:49:20 +03:00
aivanov@mysql.com
9296fb241d Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582. 
Applied innodb-5.0-ss149/162 snapshots.
 2006-01-31 21:41:48 +03:00
msvensson@devsrv-b.mysql.com
04d6b7fa54 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my41-bug15302 
into  devsrv-b.mysql.com:/space/magnus/my41-bug15302
 2006-01-31 18:51:15 +01:00
msvensson@devsrv-b.mysql.com
e899ab07c2 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/my50-bug15302
 2006-01-31 16:42:25 +01:00
msvensson@devsrv-b.mysql.com
b844f62614 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my50-bug15302 
into  devsrv-b.mysql.com:/space/magnus/my50-bug15302
 2006-01-31 15:14:46 +01:00
dlenev@mysql.com
7715538018 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
 2006-01-31 15:51:55 +03:00
msvensson@neptunus.(none)
ba81b1dd52 Merge neptunus.(none):/home/msvensson/mysql/bug15302/my41-bug15302 
into  neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302
 2006-01-31 12:52:25 +01:00
msvensson@neptunus.(none)
b758b690a1 Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1) 
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
 - Change mysqltest to detect when there aren't as many warnings available as was reported.
 2006-01-31 12:47:22 +01:00
dlenev@mysql.com
a25ca5fa63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
 2006-01-31 14:43:41 +03:00
pem@mysql.com
c9476999ef Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
 2006-01-31 09:49:54 +01:00
patg@govinda.patg.net
1ab24c0b55 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0
 2006-01-30 10:55:24 -08:00
pem@mysql.com
f19bd0639b Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
 2006-01-30 16:27:35 +01:00
pem@mysql.com
1043e1ba84 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
 2006-01-30 15:06:33 +01:00
SergeyV@selena.
624eec4f58 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#15634-mysql-5.0
 2006-01-30 17:03:09 +03:00
paul@snake-hub.snake.net
b4f8b1b376 information_schema_db.result, information_schema.result: 
Fix test result.
table.h, sql_show.cc:
  Put I_S tables in lexical order.
 2006-01-28 19:44:51 -06:00
dlenev@mysql.com
737084b229 Fix for bug #16829 "Firing trigger with RETURN crashes the server" 
We should disallow usage of RETURN statement in triggers and emit
error at parsing time (instead of crashing when trigger is fired).
 2006-01-28 12:50:16 +03:00