jani@hynda.mysql.fi
a5d6a691dd
Fixed a previous patch.
2008-02-18 16:47:00 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
1569f152da
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2008-02-12 10:45:08 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
4f98f3e683
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2008-02-08 12:13:33 +01:00
kostja@dipika.(none)
092cadbdd1
Merge dipika.(none):/opt/local/work/mysql-5.0-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-07 23:53:03 +03:00
kostja@dipika.(none)
bf7991ba2f
Fix compile warning about undefined rmdir() function.
2008-02-07 23:52:30 +03:00
msvensson@pilot.mysql.com
4df354a6c5
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-runtime
2008-02-07 14:07:41 +01:00
msvensson@pilot.mysql.com
04ca458fcb
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
2008-02-07 12:42:49 +01:00
kaa@kaamos.(none)
0cec5f8e4b
Merge kaamos.(none):/data/src/mysql-5.1
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-10 20:44:23 +03:00
tnurnberg@white.intern.koehntopp.de
977a189e24
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 14:17:18 +01:00
tnurnberg@white.intern.koehntopp.de
72b007864e
Merge mysql.com:/misc/mysql/31752_/50-31752_
...
into mysql.com:/misc/mysql/31752_/51-31752_
2007-12-17 12:11:14 +01:00
tnurnberg@white.intern.koehntopp.de
5016d16507
Merge mysql.com:/misc/mysql/31752_/41-31752_
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 12:10:26 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
93894a444e
Bug#31752: check strmake() bounds
...
fix test program
2007-12-17 12:09:21 +01:00
anozdrin/alik@station.
151444c626
Merge station.:/mnt/raid/alik/MySQL/devel/5.1
...
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt
2007-12-14 16:30:22 +03:00
kostja@bodhi.(none)
5b80d6a11b
Fix broken embedded build (broken by the patch for Bug#12713, first part).
2007-12-13 23:58:55 +03:00
gluh@eagle.(none)
4f5868114a
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 15:56:04 +04:00
gluh@eagle.(none)
e039595029
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-12-13 14:52:49 +04:00
tnurnberg@white.intern.koehntopp.de
9598ea4f45
Merge mysql.com:/misc/mysql/31177/50-31177
...
into mysql.com:/misc/mysql/31177/51-31177
2007-12-01 15:53:56 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
31d4e58ad4
Bug#31177: Server variables can't be set to their current values
...
Default values of variables were not subject to upper/lower bounds
and step, while setting variables was. Bounds and step are also
applied to defaults now; defaults are corrected quietly, values
given by the user are corrected, and a correction-warning is thrown
as needed. Lastly, very large values could wrap around, starting
from 0 again. They are bounded at the maximum value for the
respective data-type now if no lower maximum is specified in the
variable's definition.
2007-11-30 06:32:04 +01:00
jani@hynda.mysql.fi
e8d8102a93
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
...
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
2007-11-08 13:23:08 +02:00
msvensson@pilot.mysql.com
64019f014d
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-11-06 11:07:30 +01:00
msvensson@pilot.mysql.com
5fb96884d1
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004
...
into pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
2007-11-01 16:49:39 +01:00
msvensson@pilot.mysql.com
53bc1d5c25
Bug#31004 mysqltest needs a --mkdir command
...
- Add new mysqltest command "mkdir" and "rmdir"
2007-11-01 15:42:19 +01:00
msvensson@pilot.mysql.com
ec5ee6f5e4
Fix comment
2007-11-01 11:01:05 +01:00
msvensson@pilot.mysql.com
3ef9cb4ed9
Backport mysqltests "change_user" command
2007-10-31 18:44:31 +01:00
malff@lambda.hsd1.co.comcast.net.
94b4f4a870
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-18 19:21:07 -06:00
malff@lambda.hsd1.co.comcast.net.
2d6fbbda59
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-18 16:57:51 -06:00
davi@moksha.com.br
253439874a
Bug#31608 missing mysqltest change_user command
...
Post merge fixes: close any open statement before
the change user command and fix test case output.
2007-10-17 16:43:30 -03:00
davi@moksha.com.br
c3447cef35
Bug#31608 missing mysqltest change_user command
...
The problem is that currently there is no way to test the behavior
of the mysql_change_user() function using the mysqltest suite because
there is no internal command for it.
The solution is to introduce a change_user command that can be used
to test aspects of the MySQL client function mysql_change_user().
2007-10-16 12:29:22 -03:00
tsmith@ramayana.hindu.god
d207867cf5
Fix compiler warning (use correct data type)
2007-10-09 18:45:29 -06:00
msvensson@shellback.(none)
9571e7ec87
Update for 5.1 format of dirname_part
2007-10-05 18:22:28 +02:00
msvensson@shellback.(none)
d376c3da5e
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-10-05 18:19:37 +02:00
msvensson@shellback.(none)
39a069b296
Bug#31398 problems with mysql-test-run, part2
...
Write .reject file to r/ if it's writable else use opt_logdir
2007-10-05 18:18:50 +02:00
monty@narttu.mysql.fi
5dcb64882d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-10-01 15:33:21 +03:00
monty@mysql.com/narttu.mysql.fi
315acca125
Removed extra spaces
...
Added extra debug
2007-10-01 15:32:07 +03:00
anozdrin/alik@station.
0635a75f4a
Fix compilation warnings.
2007-10-01 00:16:50 +04:00
anozdrin/alik@station.
95e01d4453
Fix compile warnings.
2007-09-29 23:31:08 +04:00
tnurnberg@sin.intern.azundris.com
f3b1822c7a
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/tnurnberg/15327/51-15327
2007-09-15 05:12:02 +02:00
tnurnberg@sin.intern.azundris.com
7451aaf48c
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/tnurnberg/15327/50-15327
2007-09-15 04:45:20 +02:00
tnurnberg@sin.intern.azundris.com
d5174aad89
Merge mysql.com:/home/tnurnberg/15327/50-15327
...
into mysql.com:/home/tnurnberg/15327/51-15327
2007-09-15 04:09:38 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
3c6ca8d6ed
Bug #15327 : configure: --with-tcp-port option being partially ignored
...
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
2007-09-13 16:19:46 +02:00
msvensson@pilot.(none)
3df9790e41
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 16:47:41 +02:00
msvensson@pilot.(none)
4a7087526f
Streamline "do_close_connection" and "do_send_quit"
...
Fix typo, "next_con" -> "con"
2007-08-28 16:47:05 +02:00
msvensson@pilot.(none)
221dba148e
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 15:33:14 +02:00
msvensson@pilot.(none)
4a013e295d
Move "analyze_testcase_failure" to mysqltest(since it knows best when
...
to perform this analyzis)
2007-08-28 15:32:13 +02:00
msvensson@pilot.(none)
ccfbae831f
Fix warning
2007-08-28 11:39:29 +02:00
tsmith@ramayana.hindu.god
c87236ce91
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-27 18:20:54 -06:00
msvensson@pilot.(none)
40bcf44eff
Merge pilot.(none):/data/msvensson/mysql/work/my50-work
...
into pilot.(none):/data/msvensson/mysql/work/my51-work
2007-08-13 15:48:26 +02:00
msvensson@pilot.(none)
51580c6405
Improve error messages
...
Write test results to var/log
Add test for "source" and variable expansion
2007-08-13 15:46:11 +02:00
monty@mysql.com/nosik.monty.fi
e53a73e26c
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
...
Faster thr_alarm()
Added 'Opened_files' status variable to track calls to my_open()
Don't give warnings when running mysql_install_db
Added option --source-install to mysql_install_db
I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read() -> index_read_map()
index_read_idx() -> index_read_idx_map()
index_read_last() -> index_read_last_map()
2007-08-13 16:11:25 +03:00
msvensson@pilot.(none)
02419588a4
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-13 11:35:10 +02:00