Commit graph

24680 commits

Author SHA1 Message Date
georg@lmy002.wdf.sap.corp
9293bdc849 fix for bug#11893
increased version number for shared lib to 15
2005-07-16 00:23:33 +02:00
bell@sanja.is.com.ua
b4a723e4d2 post merge changes: added safe_charset_converter to other static functions 2005-07-16 00:52:00 +03:00
bell@sanja.is.com.ua
8aad35f9d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-07-16 00:17:05 +03:00
bell@sanja.is.com.ua
6114bee47c stop evaluation constant functions in WHERE (BUG#4663)
correct value of CURRENT_USER() in SP with "security definer" (BUG#7291)
2005-07-16 00:01:44 +03:00
jimw@mysql.com
eb785d70b8 Fix error in formatting metadata in mysqltest. 2005-07-15 12:31:57 -07:00
reggie@linux.site
95a5c8ef49 Merge linux.site:/home/reggie/bk/bug7403
into  linux.site:/home/reggie/bk/mysql-5.0
2005-07-15 12:15:45 -06:00
brian@zim.(none)
aa032356e2 Removed dead options, fixed pentium script to no longer ask for isam (its not included in 5.0). 2005-07-15 11:15:44 -07:00
jimw@mysql.com
b4b874568b Merge mysql.com:/home/jimw/my/mysql-4.1-9979
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 10:52:22 -07:00
pem@mysql.com
d503283863 Post-review fix: Made test bug9538 test robust. 2005-07-15 19:46:44 +02:00
pem@mysql.com
f66c839ef0 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/mysql-5.0
2005-07-15 19:46:43 +02:00
tomas@poseidon.ndb.mysql.com
d6e2fae0ae Bug#9442, moved ps ucs2 test from ps.test to ctype_ucs.test 2005-07-15 19:46:42 +02:00
tomas@poseidon.ndb.mysql.com
ab20a6f654 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 17:27:26 +02:00
pem@mysql.com
7d7f34cf1c Fixed BUG#9538: SProc: Creation fails if we try to SET system variable
using @@var_name in proc
  Made sure we don't lose the tokenizer state when swapping lex in during SET
  parsing.
2005-07-15 17:24:19 +02:00
lenz@mysql.com
1ca37ca193 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-07-15 17:19:25 +02:00
pem@mysql.com
10db4d030f Made .c files compile with a C compiler. 2005-07-15 17:19:25 +02:00
tomas@poseidon.ndb.mysql.com
da6533e8bb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 17:19:24 +02:00
tomas@poseidon.ndb.mysql.com
d8a584f064 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 17:14:34 +02:00
georg@lmy002.wdf.sap.corp
02599bdf27 minor fix for restoring the previous characterset in
test_client_character_set
2005-07-15 17:05:00 +02:00
tomas@poseidon.ndb.mysql.com
d0d82338cb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 15:40:15 +02:00
georg@lmy002.wdf.sap.corp
00398f5e1e Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0
2005-07-15 15:06:47 +02:00
georg@lmy002.wdf.sap.corp
8c4cd0427f Fix for bug #11037.
When all rows are fetched subsequent calls to mysql_stmt_fetch return
now MYSQL_NO_DATA instead of errorcode 1.
2005-07-15 14:30:47 +02:00
reggie@linux.site
f9adcc3cac Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into  linux.site:/home/reggie/bk/bug7403
2005-07-15 06:15:00 -06:00
tomas@poseidon.ndb.mysql.com
b144b920a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
2005-07-15 14:14:59 +02:00
tomas@poseidon.ndb.mysql.com
f54afc792f Merge 2005-07-15 14:13:23 +02:00
tomas@poseidon.ndb.mysql.com
f97c11fe03 minor type fixes to prev patch 2005-07-15 13:57:21 +02:00
tomas@poseidon.ndb.mysql.com
cd590a6a02 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
2005-07-15 13:32:08 +02:00
tomas@poseidon.ndb.mysql.com
52d40b3f60 Merge mysqldev@production.mysql.com:my/mysql-4.1-release
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
2005-07-15 13:30:01 +02:00
ramil@mysql.com
cd20ee4361 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-15 16:27:59 +05:00
ramil@mysql.com
ffb7421955 NO_DEFAULT_VALUE_FLAG and BLOB_FLAG combined 2005-07-15 16:25:31 +05:00
ramil@mysql.com
b11d04e50a a fix (bug #9881: ALTER TABLE gives wrong error message with sql-mode TRADITIONAL). 2005-07-15 15:50:57 +05:00
tomas@poseidon.ndb.mysql.com
ca75369663 BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener
+ added close of some fd's
      + debug prints
2005-07-15 12:40:20 +02:00
tomas@poseidon.ndb.mysql.com
c9e320019b Bug #11132, reverted bug-fix, it introduces another bug. Ndbd's may get the same nodeid
In 4.1 the connection to the management server _must_ stay, that is how we
ensure that the nodeids are reserved correctly
2005-07-15 12:35:26 +02:00
dlenev@mysql.com
336a56e062 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg9565
2005-07-15 14:17:32 +04:00
reggie@linux.site
65a1d74fb1 added a comment referring to the bug report 2005-07-15 03:51:55 -06:00
dlenev@mysql.com
2564656307 Added test case for bug #9565 "Wrong locking in stored procedure if a
sub-sequent procedure is called" which was fixed by the same patch
as bug #9597 "read lock stays when querying view from stored procedure".
2005-07-15 13:34:48 +04:00
konstantin@mysql.com
68fb78ca33 Improve a comment. 2005-07-15 13:21:08 +04:00
tomas@poseidon.ndb.mysql.com
da6d150453 BUG#11596 (partial fix), IP addresses not shown in ndb_mgm SHOW command on second ndb_mgmd (or on ndb_mgmd restart) 2005-07-15 10:44:54 +02:00
tomas@poseidon.ndb.mysql.com
36777ad2b7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 10:22:10 +02:00
lenz@mysql.com
d9de51cf23 Merge mysql.com:/space/my/mysql-4.1.13-clone
into mysql.com:/space/my/mysql-5.0-build
2005-07-15 09:23:36 +02:00
lenz@mysql.com
cad779388a Merge mysql.com:/space/my/mysql-4.1.13-clone
into mysql.com:/space/my/mysql-4.1-build
2005-07-15 09:15:06 +02:00
lenz@mysql.com
0487cb938e - manual merge of the fix for BUG#10984: create a "mysql" user group and assign the
mysql user account to that group in the server postinstall section of the RPM spec
  file
2005-07-15 09:07:33 +02:00
lenz@mysql.com
0d7a2641b5 RPM spec file improvements:
- create a "mysql" user group and assign the mysql user account to that group
  in the server postinstall section. (BUG 10984)
- backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
  Brazilian translations, more consequent use of macros)
2005-07-15 08:54:11 +02:00
ramil@mysql.com
07d4f27195 Jim's fix for the #10443.
Fix handling of floats and doubles when using prepared statements             
API in the embedded server.
2005-07-15 11:17:57 +05:00
tomas@poseidon.ndb.mysql.com
fd884fdd0a merge, adopted structured event interface to filter out "PING" events c.f. BUG#11898, ndb_mgmd does not release resources 2005-07-15 02:31:13 +02:00
tomas@poseidon.ndb.mysql.com
d97cccd32b Merge 2005-07-15 01:41:59 +02:00
bell@sanja.is.com.ua
0f6e1380dc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-15 01:29:37 +03:00
bell@sanja.is.com.ua
a7834de02d take into account table lock mode when opening table:
try to find most suitable table, to avouid pickup table with too low locking mode or occupy table with write mode for select when it will be need for update later
(BUG#9597)
2005-07-15 01:22:14 +03:00
konstantin@mysql.com
fbf35e0e37 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-07-15 02:13:08 +04:00
konstantin@mysql.com
a4a5bc42a6 Fix ps.test in --ps-protocol 2005-07-15 02:11:07 +04:00
konstantin@mysql.com
60e7d6ff37 Post-merge fixes. 2005-07-15 00:41:58 +04:00