bar@mysql.com
3ff1acb8db
Bug#12363
...
character_set_results is nullable, but value_ptr returns string "NULL"
set_var.cc:
Create Item_null instead of Item_string for NULL values
variables.result, variables.test:
adding test case
2005-08-30 17:11:59 +05:00
bar@mysql.com
96e0cb8cbf
ctype_utf8.result, ctype_utf8.test, item.cc:
...
Bug#12371 executing prepared statement fails (illegal mix of collations)
After review fixes.
2005-08-29 16:49:01 +05:00
bar@mysql.com
be470c38c6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12371
2005-08-29 15:44:49 +05:00
hf@deer.(none)
5b35789d12
Merge deer.(none):/home/hf/work/mysql-4.1.9645
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-08-27 18:06:09 +05:00
monty@mishka.mysql.com
9605c5dba2
Add back changes lost in merge
...
(Faster test)
2005-08-25 10:19:06 +03:00
serg@sergbook.mysql.com
714b27c71c
merged
2005-08-25 00:08:02 +04:00
monty@mishka.local
17654cd7af
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea
Review fixes
2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b
Merge mysql.com:/home/jimw/my/mysql-4.1-12302
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-24 08:50:12 -07:00
heikki@hundin.mysql.fi
4bedb3091c
subselect2.result:
...
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
2005-08-24 18:05:54 +03:00
kent@mysql.com
4d2cc6e503
Merge
2005-08-23 18:06:24 +02:00
serg@sergbook.mysql.com
1fbb96ea97
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-08-23 14:16:17 +04:00
jimw@mysql.com
f70beef6c7
Use the hostname with which the user authenticated when determining which
...
user to update with 'SET PASSWORD = ...'. (Bug #12302 )
2005-08-22 15:48:50 -07:00
hf@deer.(none)
bded7c984b
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.9645
2005-08-22 18:24:17 +05:00
serg@sergbook.mysql.com
eadb86d56f
after pull cleanup
2005-08-22 13:20:02 +04:00
hf@deer.(none)
45b07fd422
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.9645
2005-08-22 13:08:44 +05:00
jonas@eel.(none)
a58c0e7dae
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-21 16:35:27 +02:00
elliot@mysql.com
d9e3ad09e5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
2005-08-20 22:33:45 -04:00
sasha@asksasha.com
e038bfe8ff
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-20 16:09:59 -06:00
elliot@mysql.com
bbbb56df8f
Fix ctype_cp932 test to be deterministic on different machines.
2005-08-19 17:55:28 -04:00
igor@rurik.mysql.com
55fd68ccd7
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 12:10:34 -07:00
elliot@mysql.com
d9efe655ed
Bug#11338 Fixes from review (identical functionality).
2005-08-19 14:49:34 -04:00
igor@rurik.mysql.com
2d32b77693
distinct.test, distinct.result:
...
Added test cases for bug #12625 .
sql_select.cc:
Fixed bug #12625 .
Fixed invalid removal of constant items from the DISTINCT
list in the function create_distinct_group.
2005-08-19 01:57:22 -07:00
jonas@eel.(none)
290cfe313c
Merge eel.(none):/home/jonas/src/mysql-4.1-push
...
into eel.(none):/home/jonas/src/mysql-4.1
2005-08-19 07:51:47 +02:00
jonas@eel.(none)
523039c832
ndb
...
rename config.cpp -> ndb_config.cpp for case insesitive filesystems
why wasn't this done in 4.1 directly
2005-08-19 07:48:59 +02:00
sasha@asksasha.com
c594ab7921
updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication).
...
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query
logging does work.
2005-08-18 21:40:14 -06:00
kent@mysql.com
86e5ddeb52
ps_conv.inc:
...
Adjustment of float results for Windows
mysql-test-run.pl:
Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
have_lowercase0.inc:
new file
2005-08-18 22:27:12 +02:00
jonas@eel.(none)
96f719818c
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-18 14:07:31 +02:00
jonas@eel.(none)
3b68047235
bug#12118 - ndb alter table data loss
...
Split table version into 2 (major, minor)
Impl. signaling to API when table has been altered
Allow running transactions to use any minor number for transactions
2005-08-18 14:02:25 +02:00
kent@mysql.com
1476a52433
mtr_timer.pl, mysql-test-run.pl, mtr_report.pl, mtr_process.pl:
...
Added suite and test case timeout
mtr_timer.pl:
new file
2005-08-18 00:16:44 +02:00
kent@mysql.com
adb94df296
mtr_process.pl:
...
Bug#11792: Create a shell like 'mysqltest' exit status
2005-08-18 00:07:17 +02:00
kent@mysql.com
1dddccb8e9
mtr_process.pl:
...
Longer shutdown timeout, slave may be in reconnect
HUP seem to disturb exit(), added sleep to make sure
output is flushed
2005-08-17 23:47:03 +02:00
sasha@asksasha.com
76a59be6fb
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-17 12:39:30 -06:00
kent@mysql.com
e1351afcca
mysql-test-run.pl, mtr_misc.pl:
...
Bug#12615: Host name might not resolve, use short host name
2005-08-17 14:40:23 +02:00
kent@mysql.com
16359fc02f
mysql-test-run.pl:
...
Bug#11884: Corrected --start-and-exit, start the server
as if the default/specified test case would have been run
2005-08-17 03:35:50 +02:00
kent@mysql.com
c3104d1af1
mtr_process.pl:
...
Bug#11792: Check all of status code, to catch a crash as a failure
mtr_cases.pl:
Code cleanup for skipped/disabled handling
mtr_process.pl:
In debug mode, report if mysqladmin did not at least
make the server stop listening to the port.
Increased the time waiting for terminating to 20 seconds,
to wait for really slow slave shutdown.
Added call to start_reap_all(), to avoid zombies.
mtr_report.pl:
Removed prototype for unused function mtr_report_test_disabled()
2005-08-17 01:18:13 +02:00
kent@mysql.com
9457373c5f
mtr_process.pl:
...
Bug#12094: Let sleep_until_file_created() return the pid as intended
2005-08-16 19:49:43 +02:00
igor@rurik.mysql.com
d553e16518
subselect.result:
...
Added missing drop statement
subselect.test:
Added missing drop statement.
2005-08-15 21:43:46 -07:00
igor@rurik.mysql.com
9693dc6a6b
sql_select.cc:
...
Fixed bug #11479 .
The JOIN::reinit method cannot call setup_tables
after the optimization phase since this function
removes some optimization settings for joined
tables. E.g. it resets values of the null_row flag to 0.
subselect.result, subselect.test:
Added a test case for bug #11479 .
2005-08-15 21:33:58 -07:00
jimw@mysql.com
cd0f3596be
Merge mysql.com:/home/jimw/my/mysql-4.1-11688
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 10:18:14 -07:00
bell@50.0.168.192.in-addr.arpa
8d7a364074
Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
2005-08-13 07:49:22 +03:00
bell@50.0.168.192.in-addr.arpa
c96bedb745
Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
2005-08-13 07:46:06 +03:00
bell@50.0.168.192.in-addr.arpa
1e248ceaf1
fixed convertion and handling IN subqueries with rows (BUG#11867)
2005-08-13 07:45:14 +03:00
bar@mysql.com
fd7ad7f16f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12351
2005-08-12 15:44:03 +05:00
sanja@arthur.local
3b64651683
query_cache_notembedded.test, query_cache_notembedded.result:
...
postmerge fix
2005-08-11 13:07:08 +03:00
jimw@mysql.com
078e0c3902
Fix mysql_info() returning bad data in the results of a multi-statement
...
query that mixed statements that do and do not return info. (Bug #11688 )
2005-08-10 18:32:17 -07:00
hf@deer.(none)
13a23f70b9
Fix for bug #9465 (check table extended fails with SPATIAL)
2005-08-09 21:30:28 +05:00
acurtis@xiphis.org
aa99bd61c0
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/p2-bug10109.3
2005-08-09 16:35:51 +01:00
igor@rurik.mysql.com
253883803b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-08 16:55:29 -07:00