database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00
Code Activity
19,044 Commits 3,264 Branches 1,096 Tags
da091f2c22d8f5e2648490dec04546b27ecfd0ee
Commit Graph

4276 Commits

Author SHA1 Message Date
ingo@mysql.com
da091f2c22 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-21 12:14:16 +01:00
ingo@mysql.com
565c2fdb6c Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-21 09:53:31 +01:00
ram@gw.mysql.r18.ru
84f0b1eeee Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-21 12:10:19 +04:00
tomas@poseidon.ndb.mysql.com
b1877967d1 ndb_autodiscover.result, ndb_autodiscover.test: 
removed this since it easily gives errors if previous tests fail
 2005-01-20 21:26:58 +01:00
ingo@mysql.com
9bf63b1436 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-20 16:41:09 +01:00
tomas@poseidon.ndb.mysql.com
86197400bc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-20 15:37:27 +01:00
tomas@poseidon.ndb.mysql.com
dd6958eb20 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-20 15:21:00 +01:00
tomas@poseidon.ndb.mysql.com
ac53ecce1c added variable NDB_MGM to be able to run the management client in tests 
added testcase for Bug#8035
    added option to wait for not-started
    Bug#8035
 2005-01-20 13:45:42 +01:00
bar@mysql.com
6b5c7c7290 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 16:08:27 +04:00
bar@mysql.com
ca48cfbfcc item_cmpfunc.cc: 
Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.
 2005-01-20 15:38:56 +04:00
ram@gw.mysql.r18.ru
dfe8132fb4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-20 14:22:02 +04:00
joreland@mysql.com
bca4f68773 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-20 10:13:45 +01:00
sergefp@mysql.com
a5a99cf7a9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-20 11:57:30 +03:00
ram@gw.mysql.r18.ru
c397751373 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-20 12:56:18 +04:00
ingo@mysql.com
ea8882be80 BUG#6034 - Error code 124: Wrong medium type. 
Version for 5.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
Now the preparation is split into two prepare methods.
The first detects the situation and defers some preparations
until the second phase.
 2005-01-19 21:20:55 +01:00
sergefp@mysql.com
9a7a47c21c Merge mysql.com:/dbdata/psergey/mysql-4.1-bug7885 
into mysql.com:/dbdata/psergey/mysql-5.0-bug7885
 2005-01-19 23:11:50 +03:00
sergefp@mysql.com
b1c3e43060 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
 2005-01-19 23:02:28 +03:00
tulin@build.mysql.com
16f77ce996 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-19 14:20:28 +01:00
gluh@gluh.mysql.r18.ru
994c1fd4d8 View field names should be case insensitive 2005-01-19 16:19:10 +03:00
ram@gw.mysql.r18.ru
f131e5a925 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-19 12:05:59 +04:00
ram@gw.mysql.r18.ru
c24c023e8c A fix (bug #6999: Traditional: Wrong SQLSTATE returned for string truncation). 2005-01-19 12:04:35 +04:00
joreland@mysql.com
2af06e0b32 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-19 07:37:42 +01:00
jimw@mysql.com
20552486e5 Fix test results from merge, and fix the symlink test which had an 
out-of-sync test and result.
 2005-01-18 15:05:16 -08:00
jimw@mysql.com
1edf7279ef Merge from 4.1. 2005-01-18 13:59:55 -08:00
jimw@mysql.com
06f60f6d65 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-18 13:34:22 -08:00
Sinisa@sinisa.nasamreza.org
a2e0ecbf03 after merge fixes 2005-01-18 23:34:15 +02:00
Sinisa@sinisa.nasamreza.org
08639a88b2 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-01-18 23:29:47 +02:00
Sinisa@sinisa.nasamreza.org
477047401c fixing wrong value for "examined rows" when UNION's are used. 2005-01-18 23:13:29 +02:00
sergefp@mysql.com
48d7fe1671 Fix for valgrind failures in get_mm_tree. 2005-01-18 23:50:42 +03:00
jimw@mysql.com
2fac8bd044 Merge changed tests 2005-01-18 12:25:56 -08:00
dlenev@mysql.com
af878017b2 Merge mysql.com:/home/dlenev/src/mysql-4.1-merges 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-18 21:27:09 +03:00
jani@ua141d10.elisa.omakaista.fi
625ae2c5a0 Added possibility to use --error <name> instead of --error <number> 
The old syntax works as well. WL#2356.
 2005-01-18 20:16:21 +02:00
sergefp@mysql.com
a55f4a5da4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 19:49:00 +03:00
dlenev@brandersnatch.localdomain
0787a97b1c Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP 
prefix", which roots were fixed in 4.0 tree.
 2005-01-18 17:45:49 +03:00
gluh@gluh.mysql.r18.ru
c965dc34cd Fix for bug #7981: SHOW GLOBAL STATUS crashes server 2005-01-18 17:37:45 +03:00
sergefp@mysql.com
b1d55200b1 Fix for BUG#7885 2005-01-18 17:26:05 +03:00
sergefp@mysql.com
d89166cd34 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:46:26 +03:00
bar@mysql.com
b2dbddc39d Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-18 10:45:09 +04:00
bar@mysql.com
8f23e90232 #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals 
We should not overwrite res if it is returned from a const item.
 2005-01-18 10:42:29 +04:00
monty@mysql.com
9ad75d8c75 After merge fixes 2005-01-18 05:07:22 +02:00
jimw@mysql.com
a35c324358 Fix over-optimization that could result in an unsigned double field being 
set to a negative value. (Bug #7700)
 2005-01-17 16:13:56 -08:00
timour@mysql.com
bb77b2e55f Fix for BUG#7331 merged manually from 4.1. 2005-01-17 17:19:33 +02:00
timour@mysql.com
06fce173c0 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 12:41:59 +02:00
sergefp@mysql.com
6303ca7efa Fixes in opt_range.cc: ROR plan choice code 
* Removed unused parameters 
 * Fixed several cost calculation errors in ror_intersect_add
 * Better code structure for ror_intersect_add and get_best_ror_intersect
 2005-01-17 00:18:19 +03:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
monty@mysql.com
8d616390e9 After merge fixes 
Fix for BIT(X) field as string
 2005-01-15 17:38:43 +02:00
monty@mysql.com
3b0f8cabaf Merge with global tree 2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
monty@mysql.com
a37e91e435 Changed interface for my_strntod() to make it more general and more portable 2005-01-15 12:28:38 +02:00
guilhem@mysql.com
09f36a69b9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-15 10:21:50 +01:00