lars@mysql.com
b6a65715d6
BUG#12542: Prevous patch was incorrect. This removed the patch.
2005-08-15 17:53:38 +02: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
tsmith@.mysql.com
9097bd2f08
sql_parse.cc:
...
Don't skip SET command even if --replicate-wild* says to.
E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542 )
2005-08-13 05:08:29 +02:00
jimw@mysql.com
f693d22bb1
Make sure to clean up temporary files in myisampack even when the
...
-T option is used. (Bug #12235 )
2005-08-12 11:44:25 -07:00
lenz@mysql.com
acaad2c70b
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0-merge
2005-08-12 14:44:16 +02:00
lenz@mysql.com
61a9bace12
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-merge
2005-08-12 14:44:03 +02:00
reggie@linux.site
869869fa0c
Bug #6581 Failure to start mysql server on Windows with AWE option enabled
2005-08-12 04:44:04 -06: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
lenz@mysql.com
8a72ee556d
Merge mysql.com:/space/my/mysql-4.0-merge
...
into mysql.com:/space/my/mysql-4.1-merge
2005-08-12 08:13:02 +02:00
patg@radha.local
15ba37d438
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1.clean
2005-08-12 03:34:57 +02:00
lenz@mysql.com
16b696a60e
- another comment typo fixed
2005-08-11 21:18:45 +02:00
lenz@mysql.com
c1c336f84b
- Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
...
preflight/postflight instead, so they are run every time a PKG is installed, not only for
a fresh installation
2005-08-11 20:23:12 +02:00
lenz@mysql.com
776bf91371
- Make sure the Mac OS X support files are built, but not installed by "make install" (the previous
...
change was too drastic) (BUG#12506)
2005-08-11 20:13:12 +02:00
kent@mysql.com
fd4880814c
Makefile.am:
...
config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
2005-08-11 13:47:24 +02:00
sanja@arthur.local
3b64651683
query_cache_notembedded.test, query_cache_notembedded.result:
...
postmerge fix
2005-08-11 13:07:08 +03:00
bell@51.0.168.192.in-addr.arpa
4f26fa5184
merge
2005-08-11 10:20:06 +03:00
bell@51.0.168.192.in-addr.arpa
66a055b4d6
make the same filenames as in 4.1
2005-08-11 09:29:50 +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
patg@radha.local
8c83f14b76
BUG #12253 . Fixed logic the prevented repair when "--fast" was included
...
in invoking mysqlcheck.
2005-08-10 23:37:17 +02:00
bell@52.0.168.192.in-addr.arpa
1dff783854
block using QC in case of having tables locked by LOCK... (BUG#12385)
2005-08-10 18:58:55 +03:00
mskold@mysql.com
978d67a9ea
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-08-10 09:52:58 +02:00
mskold@mysql.com
7ccf9b9708
Added support for ha_ndbcluster::info(HA_STATUS_AUTO)
2005-08-10 09:38:36 +02:00
jimw@mysql.com
194360397c
Rename rest() macro in my_list.h to list_rest(). (Bug #12327 )
2005-08-09 18:02:36 -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
bar@mysql.com
a856f155c6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b5439
2005-08-09 09:07:12 +05:00
jimw@mysql.com
d6a8330e39
Avoid problems on shutdown by shutting down replication slave threads
...
after normal connection threads. (Bug #11796 )
2005-08-08 18:05:27 -07: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
igor@rurik.mysql.com
73be194f96
subselect.test, subselect.result:
...
Added a test case for bug #12392 .
item_cmpfunc.cc:
Fixed bug #12392 .
Missing handling of rows containing NULL components
when evaluating IN predicates caused a crash.
2005-08-08 16:51:12 -07:00
monty@mysql.com
7b1aed3fba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-08-09 00:15:27 +03:00
monty@mysql.com
99cb083549
Review of new pushed code
...
- Fixed some error condtion when handling dates with 'T'
- Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
- Safety fixes and cleanups
2005-08-09 00:13:49 +03:00
patg@krsna.patg.net
74c7168992
BUG #12119
...
Removed unnecessary error message from mysql.cc (client program)
2005-08-08 13:50:10 -07:00
patg@krsna.patg.net
6128521b5b
item_strfunc.cc:
...
BUG #11104
Took out the offset-=delimiter_length-1 out of the for loop. It was causing
basically this:
select substring_index('the king of the the hill', 'the', -2) to not work.
The first iteration, offset would be initialised to 24, then strstr would
point at 'the king of the the* hill' ('*'means right before the
character following), returning a offset of 16. The for loop would then
decrement offset by two (3 - 1), to 14, now pointing at
"the king of th*e the hill", _skipping_ past the 'e' in the second to last
'the', and therefore strstr would never have a chance of matching the
second to last 'the', then moving on to the 'the' at the begginning of the
string!
In a nutshell, offset was being decremented by too great a value, preventing
the second to last 'the' from being ever found, hence the result of
'king of the the hill' from the query that is reported in the bug report
func_str.test:
BUG #11104
Added tests to make sure fix addresses issues in original bug report
func_str.result:
BUG #11104
New results for new tests
2005-08-08 13:46:13 -07:00
bar@mysql.com
281c8ec163
Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed
...
(important for Adobe).
mf_pack.c, mf_dirname.c, charset.c, my_sys.h:
- adding fs_character_set() function on Windows
- ignoring fake slashes which are just multibyte
parts in several functions in /mysys
Verified by Shu to work on WinXP and Win2k.
Test is not possible, or very hard to do.
2005-08-08 19:52:30 +05:00
bar@mysql.com
e6f96b4939
func_system.result, func_system.test:
...
adding test case
item_strfunc.cc:
Bug#12351
CONCAT with USER()/DATEBASE() and
a column gets strange results.
Mark created Item_str as constant, so CONCAT
cannot reuse it for optimization purposes.
2005-08-08 19:09:54 +05:00
bar@mysql.com
0ff109f170
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b10892
2005-08-08 17:49:13 +05:00
bar@mysql.com
8545cf92d0
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b10892
2005-08-08 16:22:17 +05:00
bar@mysql.com
2c8fc886b9
item.cc:
...
After review fix
2005-08-08 16:20:46 +05:00
monty@mishka.local
9a422fc3e9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-08 13:19:13 +03:00
monty@mishka.local
701703824f
Fix for BUG #11642 : [Patch]es x86 Assembler and text relocations
...
Changed assembler functions to not access global variables or variables in text segement
Added wrapper function in C to longlong2str() to pass _dig_vec_upper as an argument
2005-08-08 13:18:18 +03:00
monty@mysql.com
30a51b5323
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-08-08 13:14:29 +03:00
igor@rurik.mysql.com
245b4beb49
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-08-07 14:03:47 -07:00
ingo@mysql.com
fd946d42a8
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-07 23:03:46 +02:00
igor@rurik.mysql.com
b2a189ab07
subselect.result:
...
Added test case for bug #11867 .
Fixed results for two existing test cases.
subselect.test:
Added test case for bug #11867 .
item_subselect.cc:
Fixed bug #11867 .
Added missing code in Item_in_subselect::row_value_transformer
that caused problems for queries with
ROW(elems) IN (SELECT DISTINCT cols FROM ...).
2005-08-07 14:03:46 -07:00
sergefp@mysql.com
d820a09a68
BUG#11869: part2: post-review fixes:
...
In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may
contain MATCH(...), for which fix_index() should be called.
2005-08-07 21:03:45 +00:00
ingo@mysql.com
ec0c854cfa
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-08-07 18:28:08 +02:00
sergefp@mysql.com
047c34e5c8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug11869-part2
2005-08-07 11:05:25 +00:00
acurtis@xiphis.org
015447b211
Bug#10109
...
"INSERT .. SELECT ... ON DUPLICATE KEY UPDATE fails"
Ensure that check_insert_fields() is only called once when
doing an INSERT..SELECT
2005-08-07 03:16:15 +01:00