Commit graph

28700 commits

Author SHA1 Message Date
stewart@mysql.com
82f96a4a4f Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124
2006-01-19 21:25:15 +11:00
stewart@mysql.com
23547fafc8 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2006-01-19 21:19:33 +11:00
joerg@mysql.com
166c9f8405 Update the spec file for the shared compat RPM with version info. 2006-01-19 10:44:44 +01:00
stewart@mysql.com
5173a7f0a1 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124
2006-01-19 19:14:17 +11:00
stewart@mysql.com
26f809b66f Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2006-01-19 19:03:47 +11:00
konstantin@mysql.com
4ca48591f1 A fix and a test case for Bug#15613 "libmysqlclient API function
mysql_stmt_prepare returns wrong field length"
2006-01-18 22:50:31 +03:00
konstantin@mysql.com
0ebef5a783 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-18 20:32:39 +03:00
pem@mysql.com
6fad448a49 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 18:18:04 +01:00
pem@mysql.com
5cf8418b10 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 17:09:23 +01:00
msvensson@neptunus.(none)
051b1da9f6 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug14634/my50-bug14634
2006-01-18 14:54:13 +01:00
aivanov@mysql.com
5f7279d0d5 Applied patch recieved from Marko:
Make innodb_thread_concurrency 0 by default, and extend the usable
 range from 0 to 1000 (0 disables the thread throttling).
2006-01-18 15:20:56 +03:00
konstantin@mysql.com
d2bba04183 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-18 15:15:09 +03:00
aivanov@mysql.com
af9d6bcf83 Applied patch recieved from Marko:
Make innodb_flush_log_at_trx_commit a settable global variable.
2006-01-18 15:02:03 +03:00
msvensson@neptunus.(none)
88285b92f2 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug14634/my50-bug14634
2006-01-18 12:45:07 +01:00
joerg@mysql.com
5e69a370c4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/merge-5.0
2006-01-18 10:44:00 +01:00
joerg@mysql.com
f4d4cc6e7b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/merge-5.0
2006-01-18 09:26:48 +01:00
stewart@mysql.com
473e314a35 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124
2006-01-18 17:28:51 +11:00
stewart@mysql.com
75bc48a8d7 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11331
2006-01-18 11:37:08 +11:00
msvensson@devsrv-b.mysql.com
e83b5aaf01 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into  devsrv-b.mysql.com:/space/magnus/my41-bug14634
2006-01-17 22:35:04 +01:00
konstantin@mysql.com
19fd36e254 A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":
use the right type in mysql_stmt_attr_get
2006-01-17 23:19:43 +03:00
serg@serg.mylan
87f685edef Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-17 21:12:24 +01:00
svoj@april.(none)
70bb06685b Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1
2006-01-18 00:02:25 +04:00
msvensson@neptunus.(none)
e55af5271c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:46:02 +01:00
msvensson@devsrv-b.mysql.com
df2fefd1e9 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug14634/my41-bug14634
into  devsrv-b.mysql.com:/space/magnus/my41-bug14634
2006-01-17 19:40:40 +01:00
konstantin@mysql.com
8d6c98ed90 Bug#15206: "Misleading message "No data to FETCH":
reword the misleading message.
2006-01-17 21:10:47 +03:00
msvensson@neptunus.(none)
f729ad7d39 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:08:07 +01:00
msvensson@neptunus.(none)
8b243b3799 Fix for connection not being added to connection pool if "disable_abort_on_error" was used. 2006-01-17 19:02:42 +01:00
serg@serg.mylan
80f190e349 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-17 17:25:10 +01:00
msvensson@neptunus.(none)
5deacfc770 Merge neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634
into  neptunus.(none):/home/msvensson/mysql/bug14634/my50-bug14634
2006-01-17 16:49:12 +01:00
msvensson@neptunus.(none)
c4ddf67710 Bug #14634 Running out of diskspace on tmpdir returns an inappropriate error 2006-01-17 16:48:26 +01:00
svoj@april.(none)
f84b301bd1 BUG#3074: Unversioned symbols in shared library
libmysqlclient versioning when linked with GNU ld.
2006-01-17 18:51:08 +04:00
pem@mysql.com
ef68a070f2 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 14:44:22 +01:00
joerg@mysql.com
e2b3b1f398 Increase the version number to 4.1.18 2006-01-17 12:55:30 +01:00
pem@mysql.com
ba01e04a2c Post-review fix. (BUG#15231) 2006-01-17 12:48:48 +01:00
jani@hundin.mysql.fi
2df00e30f2 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jani/mysql-5.0
2006-01-17 13:47:41 +02:00
pem@mysql.com
7817b99857 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 12:44:51 +01:00
joerg@mysql.com
802c578c97 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/merge-5.0
2006-01-17 11:23:19 +01:00
jani@hundin.mysql.fi
1466160239 Merge jani@193.229.222.105:/my/bk/mysql-5.0
into  hundin.mysql.fi:/home/jani/mysql-5.0
2006-01-17 11:49:46 +02:00
pem@mysql.com
2f44b60752 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-17 10:04:11 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
0168444a6f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2006-01-17 10:44:20 +02:00
joerg@mysql.com
38e5a8f6d8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2006-01-17 09:05:18 +01:00
jani@hundin.mysql.fi
8b7bfe1430 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jani/mysql-5.0
2006-01-17 01:42:12 +02:00
konstantin@mysql.com
4fd615abdb A post-merge fix. 2006-01-17 01:22:01 +03:00
konstantin@mysql.com
c05b3f3bb1 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-17 01:18:00 +03:00
konstantin@mysql.com
59b1c9c87a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-4.1-root
2006-01-17 01:13:55 +03:00
konstantin@mysql.com
739ba76d64 A fix for Bug#13337 "ps test fails if configure wo/ usc2" 2006-01-17 01:03:03 +03:00
konstantin@mysql.com
34c37d1ac9 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-17 00:44:43 +03:00
konstantin@mysql.com
3d16758311 A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat) 2006-01-17 00:28:00 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
41ff5c80da Changed condition similar to code in 4.1. 2006-01-16 23:15:00 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
6eef05344f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2006-01-16 22:55:50 +02:00