msvensson@neptunus.(none)
78bae01281
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-07 09:35:46 +02:00
msvensson@neptunus.(none)
5fa2cea16f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-07 08:32:38 +02:00
brian@zim.(none)
e6bb90d618
Fixed a typo in the configure --help menu.
2005-09-06 23:32:00 -07:00
bell@sanja.is.com.ua
e3ce1a6171
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-07 00:19:59 +03:00
eric@mysql.com
bc6b036684
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/eric/bktmp/mysql-5.0
2005-09-06 14:01:47 -07:00
msvensson@neptunus.(none)
7925540f64
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715
2005-09-06 22:07:39 +02:00
msvensson@neptunus.(none)
5c8d457ec8
Backport fixes for mysqltest.test from 5.0
2005-09-06 22:03:12 +02:00
msvensson@neptunus.(none)
1cc371d0e9
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715
2005-09-06 21:12:09 +02:00
eric@mysql.com
81948e621a
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/eric/bktmp/mysql-4.1
2005-09-06 11:38:52 -07:00
bell@sanja.is.com.ua
613c267cb0
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-06 21:20:19 +03:00
bell@sanja.is.com.ua
167bc61f37
postmerge fix
2005-09-06 21:18:44 +03:00
eric@mysql.com
289bdcffa9
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/eric/bktmp/mysql-5.0
2005-09-06 11:04:36 -07:00
bell@sanja.is.com.ua
352c7b9cbc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-06 20:51:15 +03:00
anozdrin@mysql.com
b6b15ceffc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug12953
2005-09-06 21:44:51 +04:00
anozdrin@mysql.com
b291090612
Fix for Bug#12953 "Stored procedures: crash if OPTIMIZE TABLE in function"
...
OPTIMIZE TABLE statement is forbidden from usage in stored procedures/functions.
NOTE: OPTIMIZE TABLE statement can be useful in stored procedures. The idea is
that the user/administrator can create a stored procedure for admin
tasks (optimizing, backing up, etc). This procedure can be scheduled to run
automatically (by mean of internal cron (WL#1034)). So, once we can make this
statement work, it is worth doing it.
2005-09-06 21:43:06 +04:00
jani@ua141d10.elisa.omakaista.fi
9742318991
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-09-06 20:38:55 +03:00
jani@ua141d10.elisa.omakaista.fi
28a8f6cd23
Added possibility to use string values 'true' and 'false' case
...
insensitively with boolean options. Added a warning if given
value is invalid and skips the option handling in that case.
2005-09-06 20:19:49 +03:00
msvensson@neptunus.(none)
ab4f766c32
Bug #12715 Compilation of yassl/algebra.ccp fails on buildqnx2
...
- Workaround
2005-09-06 18:57:21 +02:00
msvensson@neptunus.(none)
0cf9ca5856
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-06 16:36:25 +02:00
bell@sanja.is.com.ua
40956861b5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-09-06 17:01:23 +03:00
msvensson@neptunus.(none)
b39f23d2b7
Bug #12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
...
- Common error handling regardless of --ps-protocol or not.
2005-09-06 15:41:13 +02:00
gluh@eagle.intranet.mysql.r18.ru
a5bd5e9af2
Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
...
Argument of RAND function can be constant value only
2005-09-06 16:19:59 +05:00
msvensson@neptunus.(none)
9c1c075da1
Detect comment with command using extra delimiter
2005-09-06 12:33:36 +02:00
bar@mysql.com
c71b5f4db6
mysqld.cc:
...
after merge fix
2005-09-06 15:23:03 +05:00
bar@mysql.com
51d0e0bc30
Merge mysql.com:/usr/home/bar/mysql-4.1.b9948
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-06 14:35:36 +05:00
bell@sanja.is.com.ua
1bff548cb3
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-09-06 12:18:23 +03:00
bell@sanja.is.com.ua
5a97e646d2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2005-09-06 11:18:03 +03:00
bell@sanja.is.com.ua
10c0ef69e7
support of concurent query cache resizing (BUG#12848)
2005-09-06 11:16:53 +03:00
msvensson@neptunus.(none)
7f91ddcd88
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-06 10:12:21 +02:00
serg@serg.mylan
891885e9c2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-06 09:49:22 +02:00
msvensson@neptunus.(none)
4c2ddda8b9
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-06 09:44:25 +02:00
msvensson@neptunus.(none)
6861860abe
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-06 09:42:02 +02:00
msvensson@neptunus.(none)
4cfd08d1ab
BUG#12959 mysqltest crashes if testcase passed with -x option
...
- Update test cases
2005-09-06 09:40:42 +02:00
serg@serg.mylan
db877e9bf1
comment out innochecksum until fixed
2005-09-06 09:36:32 +02:00
ndbdev@dl145b.mysql.com
c00a51504a
Merge
2005-09-06 09:01:17 +02:00
msvensson@neptunus.(none)
ef6d75d032
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-05 22:49:36 +02:00
msvensson@neptunus.(none)
466ea56376
BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
2005-09-05 22:40:13 +02:00
msvensson@neptunus.(none)
949b2329cb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-05 22:31:58 +02:00
msvensson@neptunus.(none)
a329002a11
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-05 17:12:25 +02:00
bar@mysql.com
6a5f00702d
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b9948
2005-09-05 20:05:32 +05:00
msvensson@neptunus.(none)
acd68dbf41
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 17:03:25 +02:00
msvensson@neptunus.(none)
7f848c1784
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
2005-09-05 17:01:15 +02:00
bar@mysql.com
0eafb9572a
mysqld.cc, mysql_priv.h, sql_parse.cc:
...
bug#9948
changed client-charset behavior in 4.1.x libmysql, which issue BC prob
after review fixes
2005-09-05 20:00:11 +05:00
tulin@dl145b.mysql.com
32a3dd850b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145b.mysql.com:/home/ndbdev/mysql-4.1
2005-09-05 16:54:44 +02:00
msvensson@neptunus.(none)
e21d8c50bf
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 16:51:31 +02:00
msvensson@neptunus.(none)
72228ea825
Bug#12959 mysqltest crashes if testcase passed with -x option
2005-09-05 16:50:32 +02:00
tulin@dl145b.mysql.com
d5d360b180
added --core-file option to ndb executables
...
added parseable printout in ndb_restore
2005-09-05 16:33:40 +02:00
evgen@moonbone.local
7493f615d8
func_gconcat.test, func_gconcat.result:
...
Test case for bug #12859 group_concat in subquery cause incorrect not null.
2005-09-05 17:58:29 +04:00
ramil@mysql.com
0352793605
Merge mysql.com:/usr/home/ram/work/4.1.b4214
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-09-05 18:28:56 +05:00
tulin@dl145b.mysql.com
7573d04323
Bug #12992 Cluster StopOnError = Y restarts ndbd indefinitly
2005-09-05 15:14:44 +02:00