msvensson@neptunus.(none)
dd2a184f69
Set the small configuration a little bit larger for 4.1
2006-10-05 00:12:54 +02:00
msvensson@neptunus.(none)
b6cc1e690f
Update result file
2006-10-05 00:00:34 +02:00
msvensson@neptunus.(none)
a920973e8b
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 23:58:23 +02:00
msvensson@neptunus.(none)
b56d31eb05
Add skip-bdb to im defaults file in 5.0
2006-10-04 23:57:31 +02:00
msvensson@neptunus.(none)
965c6f3bad
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 23:19:32 +02:00
msvensson@neptunus.(none)
56ccee0f6c
Only setup cmdline_myslslap if exe_mysqlslap defined
2006-10-04 23:19:06 +02:00
msvensson@neptunus.(none)
28d4e7c1ae
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 23:18:03 +02:00
msvensson@neptunus.(none)
80184739ff
Look for mysqlslap from 5.1, it's also available on windows
2006-10-04 23:15:04 +02:00
msvensson@neptunus.(none)
587754cab6
Use switch --old-log-format to mysqld started by im only in 5.1 and up
2006-10-04 23:07:49 +02:00
msvensson@neptunus.(none)
c243c7d866
Clean up de_before_start_master/slave
2006-10-04 23:05:12 +02:00
msvensson@neptunus.(none)
c29427ec3c
Use replace_regex to mask the output of file_id= in "show binlog events" that depends on previous tests
...
What is this? replace_regex in 4.1! :)
2006-10-04 22:52:44 +02:00
msvensson@neptunus.(none)
6ac9c43e51
Set slave_load_path to ../../var/tmp in version prior to 5.0 to be compatible with mysql-test-run.sh
2006-10-04 22:50:34 +02:00
msvensson@neptunus.(none)
c4ca3e8aec
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 19:21:45 +02:00
msvensson@neptunus.(none)
914f2bbc2a
Create the mysqld.spec file with a unique name in mysql-test dir, $opt_var_dir haven't been created yet
2006-10-04 19:21:22 +02:00
msvensson@neptunus.(none)
d7671d0d79
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 18:48:57 +02:00
msvensson@neptunus.(none)
0903a9f836
--ndb-extra-logging option to mysqld is not available until 5.1
2006-10-04 18:48:22 +02:00
cmiller@zippy.cornsilk.net
7c3b9384e9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356
2006-10-04 12:32:42 -04:00
cmiller@zippy.cornsilk.net
66659796ff
Bug#19356: Assert on undefined @uservar in prepared statement execute
...
The executing code had a safety assertion so that it refused to free Items
that it didn't create. However, there is a case, undefined user variables,
which would put Items into the list to be freed.
Instead, do something that is more risky in expectation that the code will
be refactored soon, as Kostja wants to do: Remove the assertions from
prepare() and execute(). Put one assertion at a higher level, before
stmt->set_params_from_vars(), which may then create new to-be-freed Items .
2006-10-04 11:19:23 -04:00
iggy@rolltop.ignatz42.dyndns.org
5384a83d12
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my50-bug19024
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-10-04 11:00:24 -04:00
iggy@rolltop.ignatz42.dyndns.org
d96be311cb
Bug #19024- SHOW COUNT(*) WARNINGS not return Errors
...
The server variable warning_count should include the number of warnings, errors and notes according to the manual
2006-10-04 10:49:39 -04:00
msvensson@neptunus.(none)
6b15f7680a
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 16:30:56 +02:00
msvensson@neptunus.(none)
d8191af7ee
Fixup the regex's parsing the mysqld's version and variables
...
Add paths for ndb binaries
Some more backport issues
2006-10-04 16:28:23 +02:00
kaa@polly.local
609a3cd295
Fixes a number of problems with time/datetime <-> string conversion functions:
...
- bug #11655 "Wrong time is returning from nested selects - maximum time exists
- input and output TIME values were not validated properly in several conversion functions
- bug #20927 "sec_to_time treats big unsigned as signed"
- integer overflows were not checked in several functions. As a result, input values like 2^32 or 3600*2^32 were treated as 0
- BIGINT UNSIGNED values were treated as SIGNED in several functions
- in cases where both input string truncation and out-of-range TIME value occur, only 'truncated incorrect time value' warning was produced
2006-10-04 17:13:32 +04:00
msvensson@neptunus.(none)
f39ff057d1
Update tests and result files after running with new mysqltest that better detects problems with test files
2006-10-04 13:09:37 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ce433e9e44
Fix for bug #21789 : DATETIME with 0000-00-00 11:22:33 should be invalid, but is accepted
...
Reject '0000-00-00 01:01:01' dates.
2006-10-04 16:00:44 +05:00
msvensson@shellback.(none)
3db774af45
Backport from 5.1
...
-Add support for detecting version and features from mysqld binary
- Autodetect netware
- Disable some features not available below 5.0
- Cleanup executable_setup to look for one executable at a time, only llok for the ones that are needed based on the selected testcases and settings
2006-10-04 12:47:32 +02:00
tsmith/tim@siva.hindu.god
f5c4d75e8f
Bug #19764 : SHOW commands end up in the slow log as table scans
...
Set a flag when a SHOW command is parsed, and check it in log_slow_statement(). SHOW commands are not counted as slow queries, even if they use table scans.
2006-10-03 21:26:55 -06:00
msvensson@neptunus.(none)
225b3e480b
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 20:28:59 +02:00
anozdrin/alik@alik.
d238bd6755
Patch for BUG#15934: im_daemon_life_cycle fails sporadically.
...
The problem was a race condition in a test case.
The fix eliminates the race condition by explicit
wait on UNIX socket to start accepting connections.
The patch affects only test suite (i.e. does not touch
server codebase).
2006-10-03 18:42:59 +04:00
msvensson@shellback.(none)
de8bc06266
Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-03 16:14:23 +02:00
msvensson@shellback.(none)
4e97643423
Delete files now moved into mysqltest.test
2006-10-03 15:59:56 +02:00
msvensson@shellback.(none)
8f3fbd2625
Add two new result files
2006-10-03 15:48:41 +02:00
msvensson@shellback.(none)
2cea0e6b13
Update mysqltest to latest version
...
- ie. backport from 5.1
- also update testcase error dected by new version
2006-10-03 15:33:44 +02:00
kroki/tomash@moonlight.intranet
995ac34a24
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix
2006-10-03 17:21:28 +04:00
kroki/tomash@moonlight.intranet
31a206e877
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix
2006-10-03 17:13:30 +04:00
msvensson@neptunus.(none)
4f46f3bde7
Merge bk-internal:/home/bk/mysql-5.0-runtime
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 14:26:11 +02:00
msvensson@neptunus.(none)
3f8edc3706
Merge bk-internal:/home/bk/mysql-5.0-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 14:24:43 +02:00
msvensson@neptunus.(none)
035b54049e
Merge bk-internal:/home/bk/mysql-4.1-runtime
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-03 12:55:33 +02:00
kroki/tomash@moonlight.intranet
8798b462b5
Fix for the patch for bug#21726: Incorrect result with multiple
...
invocations of LAST_INSERT_ID.
Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
and no LAST_INSERT_ID_EVENT was issued for binary log.
The solution is to add THD::last_insert_id_used_bin_log, which is much
like THD::last_insert_id_used, but is reset only for upper-level
statements. This new variable is used to issue LAST_INSERT_ID_EVENT.
2006-10-03 13:38:16 +04:00
msvensson@neptunus.(none)
cc0f26c83f
Merge bk-internal:/home/bk/mysql-4.1-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-03 11:20:37 +02:00
msvensson@neptunus.(none)
ffeaf3eb85
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-03 11:19:00 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
1dc22a833b
Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663
...
into mysql.com:/usr/home/bar/mysql-5.0-rpl
2006-10-03 14:17:12 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
5c38da179c
Bug#22052 Trailing spaces are not removed from UNICODE fields in an index
...
Fix: using charset-aware functions cs->cset->lengthsp() and cs->cset->fill()
instead of single byte code which is not UCS2 compatible.
2006-10-03 14:11:57 +05:00
msvensson@shellback.(none)
b08195785c
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 09:03:28 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
72ad606ece
Merge mysql.com:/usr/home/bar/mysql-4.1.b8663
...
into mysql.com:/usr/home/bar/mysql-4.1-rpl
2006-10-03 11:53:01 +05:00
dlenev@mockturtle.local
c30b6eafac
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mockturtle.local:/home/dlenev/src/mysql-4.1-rt-merge
2006-10-03 08:19:06 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f2a3f1a679
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22271/my50-bug22271
2006-10-03 09:00:03 +05:00
msvensson@shellback.(none)
3bed246481
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 01:01:06 +02:00
dlenev@mockturtle.local
8eb4401c59
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
2006-10-02 22:53:10 +04:00
jpipes@shakedown.(none)
b57051381a
Fix for Bug #21412 (client allows DELIMITER with backslash character)
2006-10-02 11:45:48 -04:00