Commit graph

53099 commits

Author SHA1 Message Date
cmiller@zippy.cornsilk.net
b077981fbb Bug#28269: FEDERATED engine fails to quote reserved words for \
field names

Add a test that proves the bug is fixed.  This doesn't add any
new server code.
2008-03-06 14:07:49 -05:00
cmiller@zippy.cornsilk.net
b80f05181b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34726/my51-bug34726
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-03-05 17:13:00 -05:00
cmiller@zippy.cornsilk.net
fe7c9b6f0a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug#33464/my51-bug#33464
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-03-05 14:22:52 -05:00
cmiller@zippy.cornsilk.net
8dacb206ae Move test that has more to do with grants than DROP. We shouldn't have
grant warnings on embedded server.
2008-03-05 14:18:35 -05:00
cmiller@zippy.cornsilk.net
c1c9cbe0d8 Bug#34726: open_tables() crashes server if running with --debug
The DBUG code emits the current value of the proc_info member of THD,
which may be set to NULL.  It was wrong to dereference that value
with the format string %s without verifying that it was valid.

Now, insert an inline test that substitutes the string "(null)" for
NULL pointers.
2008-03-05 11:23:58 -05:00
cmiller@zippy.cornsilk.net
ed9361df27 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug#33464/my51-bug#33464
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-03-05 09:42:16 -05:00
cmiller@zippy.cornsilk.net
6217dd728a Bug#33464: DROP FUNCTION caused a crash
The cause of the crash is an assertion failure that we do not emit 
an error message (grant not found) and then return "ok".  The 
assertion is valid, and we were ignoring the buggy behavior prior 
to the "Diagnostics" result-verification.

Use an error handler to mutate innocuous missing-grant errors, when 
removing routines, into warnings.
2008-03-05 09:33:32 -05:00
joerg@trift2.
f70f7986f6 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2008-03-05 11:57:44 +01:00
joerg@trift2.
834e3314ee Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-03-05 10:28:41 +01:00
joerg@trift2.
9ea63c2782 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-03-05 10:24:28 +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
hhunger@hh-nb.hungers
40d4d3f1a7 As result of WL#4204 all charset tests are now disabled. 2008-03-03 15:58:56 +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
iggy@alf.(none)
dd5c63e0bf Merge alf.(none):/src/macro_bugs/my50-macro_bugs
into  alf.(none):/src/macro_bugs/my51-macro_bugs
2008-02-28 23:54:39 -05:00
iggy@alf.(none)
52d337bae8 Bug #24992 Enabling Shared Memory support on Windows x64 causes client to fail
- Mistaken macro defintions cause mysys to read packets in the wrong order.
2008-02-28 23:53:01 -05: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
iggy@alf.(none)
ced0dd320f Merge alf.(none):/src/macro_bugs/my50-macro_bugs
into  alf.(none):/src/macro_bugs/my51-macro_bugs
2008-02-28 17:09:20 -05:00
iggy@alf.(none)
09cd3d01e4 Merge alf.(none):/src/mysql-5.0-build
into  alf.(none):/src/macro_bugs/my50-macro_bugs
2008-02-28 16:01:21 -05:00
iggy@alf.(none)
4ab73c1db3 Merge alf.(none):/src/mysql-5.1-build
into  alf.(none):/src/macro_bugs/my51-macro_bugs
2008-02-28 15:33:54 -05: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
iggy@alf.(none)
1c0302ee79 Merge alf.(none):/src/macro_bugs/my50-macro_bugs
into  alf.(none):/src/macro_bugs/my51-macro_bugs
2008-02-27 16:22:10 -05:00
iggy@alf.(none)
efacf8caa6 Bug #23839 Multiple declarations of macros
- Remove duplicate macro defintions.
2008-02-27 16:17:05 -05: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
kent@mysql.com/kent-amd64.(none)
79929827d8 ha_ndbcluster.m4:
Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric
2008-02-26 18:43:48 +01:00
kent@kent-amd64.(none)
f3daf8ad80 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-02-26 18:38:43 +01:00
kent@mysql.com/kent-amd64.(none)
ac15eee942 Makefile.am, Info.plist.sh:
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
  Removed unneded semicolon
2008-02-26 18:36:06 +01:00
kent@kent-amd64.(none)
3426a62a9f Merge mysql.com:/home/kent/bk/build/mysql-4.1-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build
2008-02-26 18:21:45 +01:00
kent@mysql.com/kent-amd64.(none)
ff25b92543 configure.in:
Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ
SocketServer.cpp:
  Corrected typo in debug error message
2008-02-26 18:18:03 +01: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