Commit graph

24603 commits

Author SHA1 Message Date
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
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
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
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
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
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
konstantin@mysql.com
3274b050bc Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-07-15 00:31:09 +04:00
konstantin@mysql.com
7646850173 Hastily remove an occasionally checked in symlink :( 2005-07-15 00:26:19 +04:00
konstantin@mysql.com
8375f76306 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-4.1-root
2005-07-15 00:20:04 +04:00
konstantin@mysql.com
a2b11ff266 A fix and a test case for Bug#11299 "prepared statement makes wrong SQL
syntax in binlog which stops replication":
disallow the use of parameter markers which can lead to generation
of malformed binlog queries.
2005-07-15 00:01:49 +04:00
lenz@mysql.com
b5379c44a6 Merge mysqldev@production:my/mysql-4.1-release
into mysql.com:/space/my/mysql-4.1.13-clone
2005-07-14 18:13:14 +02:00
tomas@poseidon.ndb.mysql.com
ec52d680d2 misc (memleak) fixes:
added using ndb_end and showing mem allocation stat at exit
    added init of variable
    added destruction of LocalConfig to still memleak
    added delete of theFacade on exit
    stopSessions(true) on socket server to ensure destuction of threads
    added destruction of arbit manager thread
    added true option to stopSessions in transporter facade to ensure destructions of threads
2005-07-14 18:08:01 +02:00
tomas@poseidon.ndb.mysql.com
8afeb337f0 BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener
+ added close of some fd's
    + debug prints
2005-07-14 18:04:44 +02:00
konstantin@mysql.com
4ede973594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
2005-07-14 20:02:38 +04:00
konstantin@mysql.com
36810d25f3 Post-merge fixes. 2005-07-14 20:02:37 +04:00
konstantin@mysql.com
1da2b9b4d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
2005-07-14 20:02:36 +04:00
konstantin@mysql.com
4099582be2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-07-14 20:02:35 +04:00
reggie@linux.site
342dc0c7b4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into  linux.site:/home/reggie/bk/mysql-4.1
2005-07-14 10:02:34 -06:00
konstantin@mysql.com
1c142ee631 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-07-14 20:02:34 +04:00
konstantin@mysql.com
a1270b65db A fix and a test case for Bug#11183 "mysql_stmt_reset() doesn't reset
information about error".
2005-07-14 20:02:33 +04:00
tomas@poseidon.ndb.mysql.com
9be420ee10 stilled mem leak in usage on getVersionString
added __LINE__ so systemErrorLab for better error printout
2005-07-14 18:02:33 +02:00
konstantin@mysql.com
3f28ad8eb7 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-07-14 20:02:32 +04:00
tomas@poseidon.ndb.mysql.com
96a80fd220 added debug prints 2005-07-14 18:02:32 +02:00
konstantin@mysql.com
3892f1d298 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-4.1-root
2005-07-14 20:02:31 +04:00
sergefp@mysql.com
86d3c07836 Merge mysql.com:/home/psergey/mysql-4.1-build-tree
into mysql.com:/home/psergey/mysql-4.1-merge-from-build
2005-07-14 16:02:30 +00:00