msvensson@pilot.mysql.com
e1a6f3c243
Merge bk-internal:/home/bk/mysql-5.1
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1
2008-03-04 14:20:05 +01:00
joerg@trift2.
d4025ce1a6
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M51/mysql-5.1
2008-03-03 21:23:19 +01:00
joerg@trift2.
687d2131de
Raise the version number after cloning 5.0.58
2008-03-03 21:19:58 +01:00
anozdrin/alik@quad.
4772a72e92
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt
2008-03-03 14:02:36 +03:00
davi@endora.local
004a280aef
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-29 11:18:13 -03:00
anozdrin/alik@quad.
ff97087630
Fix for Bug#31947: Declare with a reserved word succeeded.
...
READ_ONLY token was accidentally placed into wrong place
('ident' rule). The proper place is in the 'keyword_sp' rule.
The manual should be re-generated after this patch, because
the manual depends on the 'keyword_sp' rule.
2008-02-29 12:21:19 +03:00
davi@buzz.(none)
2905909d89
Merge buzz.(none):/home/davi/mysql-5.0-runtime
...
into buzz.(none):/home/davi/mysql-5.1-runtime
2008-02-28 20:22:50 -03:00
davi@mysql.com/endora.local
369c249370
Post-merge fix for Bug 33851. The initialization order of members
...
must match the order which they were declared in the class definition.
2008-02-28 20:22:11 -03:00
davi@mysql.com/endora.local
41545137ef
Bug#34655 Compile error
...
Rename client_last_error to last_error and client_last_errno to last_errno
to not break connectors which use the internal net structure for error handling.
2008-02-28 14:55:46 -03:00
davi@mysql.com/endora.local
361262c7c0
Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210
...
The problem is that passing anything other than a integer to a limit
clause in a prepared statement would fail. This limitation was introduced
to avoid replication problems (e.g: replicating the statement with a
string argument would cause a parse failure in the slave).
The solution is to convert arguments to the limit clause to a integer
value and use this converted value when persisting the query to the log.
2008-02-28 11:34:08 -03:00
anozdrin/alik@quad.
55f0fba462
Disable test case due to Bug#34891: sp_notembedded.test fails
...
sporadically.
2008-02-28 17:28:33 +03:00
anozdrin/alik@quad.
b100bb1ff1
Fix for Bug#34852: SHOW OPEN TABLES output is not repeatable
...
(show_check.test fails sporadically).
Fix test case for Bug#12183 to make it stable.
2008-02-28 15:35:25 +03:00
davi@endora.local
4f98cd18b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-27 18:11:15 -03:00
davi@mysql.com/endora.local
d58c9e089e
Fix for team tree failure. Synchronously wait for the query state
...
to reach the desired value.
2008-02-27 18:08:29 -03:00
anozdrin/alik@quad.
63902469a3
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-build
2008-02-27 22:58:42 +03:00
anozdrin/alik@quad.
476653102f
Fix information_schema.test to be case-insensitive.
2008-02-27 22:53:54 +03:00
anozdrin/alik@quad.
ee94231f82
Eliminate compilation warning.
2008-02-27 22:29:58 +03:00
davi@mysql.com/endora.local
228d350e2e
Bug#34889 mysql_client_test::test_mysql_insert_id test fails sporadically
...
Disable the test case.
2008-02-27 13:05:46 -03:00
kostja@dipika.(none)
24d27e3b7c
Update Bug#12713 test results to take into account fixed bugs (29157, 33846)
2008-02-27 18:38:17 +03:00
anozdrin/alik@quad.
566ca2ba75
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt
2008-02-26 19:37:34 +03:00
anozdrin/alik@quad.
bdc83bf2cb
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-02-26 19:34:02 +03:00
anozdrin/alik@quad.
c61667bca8
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0
...
into quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
2008-02-26 19:23:37 +03:00
davi@endora.local
aeebdfcfaa
Merge mysql.com:/Users/davi/mysql/bugs/34424-5.1
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-26 12:12:57 -03:00
kostja@dipika.(none)
d54c6a7e23
Fix the remaining memory leaks (mysql_client_test).
2008-02-26 18:07:11 +03:00
davi@mysql.com/endora.local
cdd5eae9b6
Bug#34424 query_cache_debug.test leads to valgrind warnings
...
Bug#34678 @@debug variable's incremental mode
The problem is that the per-thread debugging settings stack wasn't
being deallocated before the thread termination, leaking the stack
memory. The chosen solution is to push a new state if the current
is set to the initial settings and pop it (free) once the thread
finishes.
2008-02-26 12:03:59 -03:00
kostja@dipika.(none)
4e116fe70b
Valgrind errors in mysql_client_test.
2008-02-26 17:25:21 +03:00
kostja@dipika.(none)
79d4ed082b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-26 16:22:42 +03:00
kostja@dipika.(none)
1719d9a2cd
We never check the return value of mysql_frm_type for an error. Do
...
not try to push an error into the error stack as it will be ignored anyway.
2008-02-26 16:19:23 +03:00
davi@endora.local
fd3bcbea80
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-26 10:12:26 -03:00
kostja@dipika.(none)
34f9ead01a
Merge dipika.(none):/opt/local/work/mysql-5.0-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-26 15:32:32 +03:00
kostja@dipika.(none)
74addb78e4
Fix memory leaks (valgrind)
2008-02-26 15:27:46 +03:00
kostja@dipika.(none)
461de0f35c
Use an API instead of looking into stmt internals to fetch fields
...
(Test for Bug#32265)
2008-02-26 13:55:46 +03:00
msvensson@pilot.mysql.com
0d90380af4
Merge bk-internal:/home/bk/mysql-5.1
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1
2008-02-26 09:32:08 +01:00
davi@mysql.com/endora.local
bccbc79d07
Bug#28386 the general log is incomplete
...
The problem is that the commands COM_STMT_CLOSE, COM_STMT_RESET,
COM_STMT_SEND_LONG_DATA weren't being logged to the general log.
The solution is to log the general log the aforementioned commands.
2008-02-25 07:48:02 -03:00
tsmith@ramayana.hindu.god
45442d08d4
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-22 17:08:01 -07:00
tsmith@ramayana.hindu.god
a5e90661d8
Merge ramayana.hindu.god:/home/tsmith/m/bk/b28460/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-22 17:04:28 -07:00
tsmith@ramayana.hindu.god
56719ad7f4
Bug #34053 : normal users can enable innodb_monitor logging
...
The check_global_access() function was made available to InnoDB, but
was not defined in the embedded server library. InnoDB, as a plugin,
is not recompiled when the embedded server is built. This caused a
link failure when compiling applications which use the embedded server.
The fix here is to always define check_global_access() externally; in
the embedded server case, it is defined to just return OK.
Also, don't run the test case for this bug in embedded server.
2008-02-22 16:56:34 -07:00
hhunger@hh-nb.hungers
5d16b95b78
Merge bk-internal:/home/bk/mysql-5.1-build
...
into hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
2008-02-22 22:14:34 +01:00
hhunger@hh-nb.hungers
9ef8a8499f
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
...
into hh-nb.hungers:/work/merge/mysql-5.1-build
2008-02-22 22:07:05 +01:00
hhunger@hh-nb.hungers
26ede4b6a7
Inserted changes from the review of bug#32664.
2008-02-22 21:28:59 +01:00
hhunger@hh-nb.hungers
0c6e1743f4
Merge hh-nb.hungers:/work/merge/mysql-5.1-build
...
into hh-nb.hungers:/work/merge/mysql-5.1-bug32664
2008-02-22 21:24:20 +01:00
andrey@whirlpool.hristov.com
a86ca24594
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into whirlpool.hristov.com:/work/mysql-5.1-runtime
2008-02-22 20:33:07 +01:00
kostja@dipika.(none)
c456569d99
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-22 21:49:44 +03:00
kostja@dipika.(none)
52f5069703
Update new test results after merge (Bug#12713)
2008-02-22 21:49:16 +03:00
joerg@trift2.
260081267d
mysql-test/mysql-test-run.pl
...
Disable extra team trees.
Temporary fix for entry 34761 in the bugs DB.
(Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)
2008-02-22 19:15:31 +01:00
andrey@whirlpool.hristov.com
07d9c4eeb8
Fix for Bug#29605
...
--local-infile=0 checks can be bypassed by sending a FETCH LOCAL FILE response
Add a check for CLIENT_LOCAL_FILES before sending a local file.
Beware, that all binary distributions enable sending of local files and it's up
to the programs which use libmysql to disable it, if they don't use this functionality.
Otherwise they are not safe.
2008-02-22 18:45:45 +01:00
msvensson@pilot.mysql.com
e608f14d0a
Bug#34761 Mysql-test-run.pl script hangs on Windows
2008-02-22 17:40:14 +01:00
joerg@trift2.
8b58631598
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-02-22 17:32:42 +01:00
joerg@trift2.
c93bb1bfb1
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2008-02-22 16:36:09 +01:00
andrey@whirlpool.hristov.com
04b306dad2
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into whirlpool.hristov.com:/work/mysql-5.1-runtime
2008-02-22 16:20:05 +01:00