mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18880 commits 2791 branches 343 tags 1.7 GiB
Commit graph

18880 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
guilhem@mysql.com
4aebc4b3fc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-18 14:46:25 +01:00
tomas@poseidon.ndb.mysql.com
57c28426ba compile error fix 2005-01-18 14:46:24 +01:00
sergefp@mysql.com
1eab462cca Post-review fixes for the previous cset. No code behavior changes. 2005-01-18 16:16:55 +03:00
tomas@poseidon.ndb.mysql.com
9fb87a77b1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-18 13:55:39 +01:00
lenz@mysql.com
e4d1e0e916 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-01-18 12:09:27 +01:00
lenz@mysql.com
69bfcfe33a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-18 11:41:51 +01:00
guilhem@mysql.com
5fbdd9bdcd Merge mysql.com:/home/mysql_src/mysql-4.1-clean 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-18 11:06:37 +01:00
guilhem@mysql.com
9569b0226f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-18 10:24:25 +01: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
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
monty@mysql.com
edffca827e Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2005-01-18 03:52:15 +02:00
monty@mysql.com
e5b788146a Fixed new bug that caused symlink test to fail 2005-01-18 03:49:39 +02:00
monty@mysql.com
5ba79d72a7 Anoter fix for moved IO_CACHE object 2005-01-18 02:04:41 +02:00
bell@sanja.is.com.ua
fd3d976f64 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
 2005-01-18 01:11:02 +02:00
guilhem@mysql.com
5e43cf86a6 Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'": 
Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)
 2005-01-17 21:26:14 +01:00
reggie@bob.(none)
da9f7c7ec4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql-4.1
 2005-01-17 14:08:36 -06:00
reggie@bob.(none)
e1dc421a04 Bug #7966 query cache doesn't work properly with batch statements 
sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query
 2005-01-17 13:40:36 -06:00
lenz@mysql.com
b9f3f4a221 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-17 20:33:33 +01:00
paul@kite-hub.kitebird.com
63689a210d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2005-01-17 12:38:17 -06:00
lenz@mysql.com
c84180d2c2 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-17 19:09:33 +01:00
lenz@mysql.com
b1cb5ea4dc Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.1-build
 2005-01-17 18:53:10 +01:00
bell@sanja.is.com.ua
dcfdf011c6 backported from 5.0 patch initialization of main select for commands where subqueries are possible 2005-01-17 19:52:07 +02:00
joerg@mysql.com
88b1fbaf2f Allow "classic" builds (= without InnoDB) by eliminating an "unresolved reference" (bug#7961). 2005-01-17 18:08:07 +01:00
paul@kite-hub.kitebird.com
43f98d24ee Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2005-01-17 10:47:43 -06:00
lenz@mysql.com
09a71351e0 - Enabled the handling of architecture extensions e.g. "-64bit" when building 
Mac OS X PKGs with Do-pkg
 2005-01-17 17:22:17 +01:00
kaa@polly.local
c46f527454 Fixed memory leak in handle_local_infile() 2005-01-17 19:21:01 +03: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
50e0474394 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 15:46:44 +02:00
tomas@poseidon.ndb.mysql.com
9dbe52bdcf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-17 12:53:50 +01:00
tomas@poseidon.ndb.mysql.com
beffd06278 Bug#7937 2005-01-17 12:29:43 +01: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
bar@deer.(none)
2933cd3d35 user_var.result: 
after merge fix
 2005-01-17 13:58:16 +04:00
bar@deer.(none)
3b7eb23e6b func_str.result: 
after merge fix
 2005-01-17 13:23:56 +04:00
bar@mysql.com
3d4714424c Merge 2005-01-17 12:30:12 +04:00
bar@mysql.com
e7e5e8b1e7 user_var.result, func_str.result, item_strfunc.cc: 
bug#7839 ncorrect collation for char(ascii('a'))
 2005-01-17 10:38:35 +04:00
paul@kite-hub.kitebird.com
3b9c5f3a17 mysqldump.c: 
Move out-of-order option.
 2005-01-17 00:09:47 -06:00
bar@mysql.com
d91cd61a4b Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-17 09:30:30 +04:00
bar@mysql.com
308aec1526 libmysql.c: 
bug#7891: mysql_character_set_name() returns collation
 2005-01-17 09:27:24 +04:00
tomas@poseidon.ndb.mysql.com
c6e5521bbf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-17 01:42:41 +01: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
tomas@poseidon.ndb.mysql.com
b16d58b167 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-16 21:50:31 +01:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
guilhem@mysql.com
6412558d03 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-16 21:39:20 +01:00
tomas@poseidon.ndb.mysql.com
b34715555f Makefile.am: 
Bug#7721
 2005-01-16 21:39:19 +01:00
tomas@poseidon.ndb.mysql.com
c0b21df9ec Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-16 20:13:47 +01:00
serg@serg.mylan
fa38a0d130 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-16 16:41:38 +01:00
serg@serg.mylan
8bea4729fc initialize mysql->charset in mysql_init 2005-01-16 16:38:38 +01:00