Commit graph

31650 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
e9b624df99 Change error code to test for "unknown error" with to 10000 2006-08-01 11:29:10 +02:00
gkodinov/kgeorge@rakia.(none)
8cf5a4c04e Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
2006-08-01 11:17:14 +03:00
gkodinov/kgeorge@macbook.gmz
7b5e4ed026 Bug #20103: Escaping with backslash does not work
- make the client to respect the server-side 
   no_backslash_escapes option and disable the 
   special meaning of backslash also at client side.
2006-08-01 11:05:54 +03:00
lars/lthalmann@mysql.com/dl145j.mysql.com
d8d17559ee Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-08-01 06:09:41 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
d9f5416be5 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-08-01 06:08:09 +02:00
gkodinov/kgeorge@rakia.(none)
63d198af1c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
2006-08-01 06:11:11 +03:00
evgen@sunlight.local
6806776eed Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
2006-08-01 06:42:33 +04:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b3bc1d02de Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-08-01 02:10:30 +02:00
igreenhoe/greenman@anubis.greendragongames.com
d97a344e7a Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-5.0-maint
2006-07-31 13:04:01 -07:00
igreenhoe/greenman@anubis.greendragongames.com
940db2e976 Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-4.1-maint
into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-19364
2006-07-31 12:53:47 -07:00
lars/lthalmann@mysql.com/dl145j.mysql.com
3fc037db1b Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-07-31 21:32:57 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
635281619b Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-07-31 21:30:24 +02:00
malff/marcsql@weblab.(none)
2336834e08 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-21269
2006-07-31 12:11:08 -07:00
evgen@moonbone.local
b43b2a2fe0 select.result, func_group.result, sql_select.cc:
After merge fix
2006-07-31 23:05:54 +04:00
malff/marcsql@weblab.(none)
ab86e0b3cb Bug#21269 (DEFINER-clause is allowed for UDF-functions)
The problem was that the grammar allows to create a function with an optional
definer clause, and define it as a UDF with the SONAME keyword.
Such combination should be reported as an error.

The solution is to not change the grammar itself, and to introduce a
specific check in the yacc actions in 'create_function_tail' for UDF,
that now reports ER_WRONG_USAGE when using both DEFINER and SONAME.
2006-07-31 12:01:43 -07:00
gkodinov/kgeorge@rakia.(none)
a5e56e8942 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
2006-07-31 21:17:20 +03:00
gkodinov/kgeorge@macbook.gmz
8084a9e5fb Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
made DROP VIEW to continue on error and report an aggregated error 
 at its end. This makes it similar to DROP TABLE.
2006-07-31 20:56:06 +03:00
gkodinov/kgeorge@macbook.gmz
8d4684b6b4 Merge bk-internal:/home/bk/mysql-5.0-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/B21080-5.0-opt
2006-07-31 17:40:09 +03:00
gkodinov/kgeorge@macbook.gmz
8944564fd8 Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
When executing ALTER TABLE all the attributes of the view were overwritten.
  This is contrary to the user's expectations.
  So some of the view attributes are preserved now : namely security and 
  algorithm. This means that if they are not specified in ALTER VIEW
  their values are preserved from CREATE VIEW instead of being defaulted.
2006-07-31 17:33:37 +03:00
msvensson@neptunus.(none)
f1a262bcd5 Merge bk-internal:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 16:07:28 +02:00
msvensson@neptunus.(none)
5f78c492ec Merge 192.168.0.20:mysql/bug21217/my50-bug21217
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-31 14:42:06 +02:00
msvensson@neptunus.(none)
dce84a7e05 Merge 192.168.0.20:mysql/bug21217/my41-bug21217
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 14:41:29 +02:00
msvensson@neptunus.(none)
1b88a957c5 Merge neptunus.(none):/home/msvensson/mysql/my41-bug21125
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 14:40:21 +02:00
msvensson@neptunus.(none)
2461e48698 Bug#21042 mysql client segfaults on importing a mysqldump export
- Use strmake, that will both protect the buffer and make sure it's terminated by a zero
 - Add test case
2006-07-31 14:22:32 +02:00
msvensson@neptunus.(none)
d8a5ea2621 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-31 13:12:49 +02:00
msvensson@neptunus.(none)
823ead0775 perror returns 2 if it does not understand the option --ndb
Move that perror test to ndb_basic so it's only run when there is support for --ndb
2006-07-31 13:11:21 +02:00
msvensson@neptunus.(none)
a5112188e2 Fix lowercase_fs_off problem on windows. This test should not be run if lower_case_filesystem=OFF.
By default lowercase_table_names are 1 on windows, and that makes the initialization of lower_case_filesystem variable to be skipped.
Add an else bracnh that does the initialization.
2006-07-31 12:47:56 +02:00
msvensson@shellback.(none)
5a710e8613 Merge shellback.(none):/home/msvensson/mysql/bug21217/my41-bug21217
into  shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217
2006-07-30 19:33:48 +02:00
msvensson@shellback.(none)
eaae3b2d2b BUG#21217 "mysqltest" client is inconsistent when to log a line number
- Init start_lineno to 0
2006-07-30 19:30:20 +02:00
evgen@sunlight.local
3ca575dc89 Merge sunlight.local:/local_work/tmp_merge-4.1-opt-mysql
into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
2006-07-29 23:59:53 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
4a461fdae3 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-07-29 17:40:10 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5d948f5ec4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-29 17:26:06 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f2ec5d7128 configure.in:
Corrected typo
2006-07-29 17:24:48 +02:00
kroki/tomash@moonlight.intranet
cc98d26a23 Fix after manual merge. 2006-07-29 13:50:08 +04:00
kroki/tomash@moonlight.intranet
5c90b6f810 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-07-29 13:43:34 +04:00
igreenhoe/greenman@anubis.greendragongames.com
61a3a8e95c Fix for bug #16226 (timestamp_diff truncation issue when requesting
difference between timestamp in values of months and quarters.)

Problem:  when requesting timestamp diff in months or quarters, it
would only examine the date (and not the time) for the comparison.

Solution:  increased precision of comparison.
2006-07-28 20:51:17 -07:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
bd47f4f3be udf_example.c, udf.test, Makefile.am:
Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336)
2006-07-29 04:41:50 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2faea98324 Makefile.am, configure.in:
Man page for mysqld command move to section 8 (bug#21220)
2006-07-28 23:12:40 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c188a3bf0a make_binary_distribution.sh:
Man page for "mysqld" command move to section 8 (bug#21220)
2006-07-28 23:06:49 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef0c9d7588 mysql.spec.sh:
Man page for "mysqld" command move to section 8 (bug#21220)
2006-07-28 22:57:57 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
8daec68246 Merge mysql.com:/Users/kent/mysql/bk/tmp_merge
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-07-28 21:35:43 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
50b09967f2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-07-28 21:29:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
345945165a sql_select.cc:
Renamed variable, to avoid name clash with macro "rem_size"
  on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
asn.cpp, asn.hpp:
  Avoid name clash with NAME_MAX
2006-07-28 21:26:46 +02:00
jimw@rama.(none)
ad78212d9f Merge bk-internal:/home/bk/mysql-5.0-maint
into  rama.(none):/home/jimw/my/mysql-5.0-16881
2006-07-28 12:19:13 -07:00
tsmith@maint1.mysql.com
28df542a7a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  maint1.mysql.com:/data/localhome/tsmith/bk/global-50
2006-07-28 17:40:33 +02:00
kroki/tomash@moonlight.intranet
c867301b0d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug16581
2006-07-28 18:07:47 +04:00
kroki/tomash@moonlight.intranet
d06001b1a2 Bug#16581: deadlock: server and client both read from connection in
'conc_sys' test

Concurrent execution of SELECT involing at least two INFORMATION_SCHEMA
tables, DROP DATABASE statement and DROP TABLE statement could have
resulted in stalled connection for this SELECT statement.

The problem was that for the first query of a join there was a race
between select from I_S.TABLES and DROP DATABASE, and the error (no
such database) was prepared to be send to the client, but the join
processing was continued.  On second query to I_S.COLUMNS there was a
race with DROP TABLE, but this error (no such table) was downgraded to
warning, and thd->net.report_error was reset.  And so neither result
nor error was sent to the client.

The solution is to stop join processing once it is clear we are going
to report a error, and also to downgrade to warnings file system errors
like 'no such database' (unless we are in the 'SHOW' command), because
I_S is designed not to use locks and the query to I_S should not abort
if something is dropped in the middle.

No test case is provided since this bug is a result of a race, and is
timing dependant.  But we test that plain SHOW TABLES and SHOW COLUMNS
give a error if there is no such database or a table respectively.
2006-07-28 15:06:23 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
221004a892 Removing temporary changes. 2006-07-28 05:34:59 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
ef5acd5748 Temporary changes just to check some points (will be restored). 2006-07-28 03:32:39 +04:00