Commit graph

1233 commits

Author SHA1 Message Date
kent@kent-amd64.(none)
add9cb76b5 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-06 08:33:20 +02:00
kent@mysql.com/kent-amd64.(none)
d75c7a58c1 make_win_bin_dist:
Corrected install path
2007-08-06 08:31:09 +02:00
kent@mysql.com/kent-amd64.(none)
f9fdd5ae8c make_win_bin_dist:
Copy embedded .pdb and static debug lib
2007-08-06 08:28:16 +02:00
kent@kent-amd64.(none)
6b9ac5b7cf Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-03 22:57:21 +02:00
kent@mysql.com/kent-amd64.(none)
a6d082f36d CMakeLists.txt, README, configure.js
Several adjustments to make client libraries pass the link test
  on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
2007-08-03 21:51:37 +02:00
joerg@trift2.
0bd847f013 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  trift2.:/MySQL/M50/push-5.0
2007-08-02 21:49:42 +02:00
joerg@trift2.
7ddc8c35b2 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-08-02 21:18:24 +02:00
kent@kent-amd64.(none)
dc998d9388 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
2007-08-02 20:59:23 +02:00
kent@mysql.com/kent-amd64.(none)
838a98c1e6 make_win_bin_dist:
Simplified copying of 'mysql-test' directory
2007-08-02 20:51:04 +02:00
kent@kent-amd64.(none)
b976f18c1b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
2007-08-02 15:39:34 +02:00
kent@kent-amd64.(none)
423fd0b07e Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
2007-08-02 12:56:54 +02:00
kent@mysql.com/kent-amd64.(none)
74267ad9b8 CMakeLists.txt (several), make_win_bin_dist:
Aligned client library build and use with the Unix version when it
  comes to what source to include directly in the builds, and what
  libraries to link with (bug#30118).

  Also reviewed, corrected and made more clear when static or dynamic
  Thread Local Storage is to be used. Some code duplication was removed,
  and some redundant library usage were removed, reducing the risk of
  incorrect TLS usage.
2007-08-02 12:49:27 +02:00
joerg@trift2.
9e924569d2 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-08-02 11:22:50 +02:00
tsmith@ramayana.hindu.god
7509e1ed24 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:32:01 -06:00
tsmith@ramayana.hindu.god
33c4cdaa66 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:30:55 -06:00
tsmith@ramayana.hindu.god
9ce717b0fe Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:15:24 -06:00
jperkin@production.mysql.com
ba3729a63b Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
2007-08-01 12:09:19 +02:00
jperkin@production.mysql.com
bd77d3e17c Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1-maint
2007-08-01 12:04:55 +02:00
jperkin@production.mysql.com
a311c37891 Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
2007-08-01 12:02:35 +02:00
jperkin@production.mysql.com
f5c8c9a81d Option 6 tries to grant global privileges at the database level
which does not work.  Removing these attempted privileges makes
this identical to option 5 so remove it completely.  The spirit
of the program appears to be aimed at database privileges, so do
not add another option for granting global privileges as it may
be unexpected.  Fixes bug#14618 (same as previous patch, this
time applied to -maint tree).
2007-08-01 11:58:25 +02:00
kent@kent-amd64.(none)
fd3b865149 Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build
into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build
2007-07-30 21:45:06 +02:00
tsmith@ramayana.hindu.god
950a482a4b mysqld_safe.sh:
Post-review fix, if 'logger' can't be found, and --syslog is requested, exit with error message instead of fall back to logging to error file.
2007-07-30 13:35:36 -06:00
kent@mysql.com/kent-amd64.(none)
a9d2569cba Generate "config.h" directly into the "include" directory, later copied
to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.
2007-07-30 21:09:45 +02:00
tsmith@ramayana.hindu.god
60b6716bcd Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51-b29992
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-07-27 17:27:08 -06:00
tsmith@ramayana.hindu.god
091f6a4677 Bug #29992: syslog error logging does not flush
Don't use syslog by default; user will have to request it explicitly with the --syslog option.

Use "sed -u" to get unbuffered output from sed, if it's supported.

Otherwise, don't use sed at all - don't strip the timestamp from mysqld messages.

Also, add new --syslog-tag=FOO option, which adds "-FOO" to the tag used when logging messages to syslog (i.e., mysqld-FOO or mysqld_safe-FOO)

Also, explicitly mention where log messages are going, so user can more easily find them.

Also, check if 'logger' is in the PATH, and log to the error log file if it can't be found.
2007-07-27 17:20:43 -06:00
jperkin@production.mysql.com
87a297061c Merge production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.0
into  production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.1
2007-07-27 20:28:34 +02:00
jperkin@production.mysql.com
d5293e4584 More fixes and cleanups for bug#28585:
- make the 'dist-hook' from top-level Makefile work again.
  - we can find my_print_defaults from --basedir by parsing command
    line arguments prior to running my_print_defaults.
  - take advantage of additional command line parsing and allow the
    --no-defaults etc arguments to work anywhere rather than having
    to be the first argument.
  - find SQL files either from binary archive or source install.
  - consolidate and tidy code and error messages.
2007-07-27 15:14:21 +02:00
anozdrin/alik@ibm.
aee749d0d9 Fix for BUG#30029: mysql_upgrade fails for 5.0 -> 5.1.21,
5.1.20 -> 5.1.21 upgrades.

We generate mysql_fix_privilege.sql file, which contains SQL
statements required to upgrade the system database. This script
is generated by concatenation of mysql_system_tables.sql and
mysql_system_tables_fix.sql.

The problem was that
  - in order to create general_log and slow_log tables we use
    stored programs in mysql_system_tables.sql;
  - we upgrade mysql.proc table in mysql_system_tables_fix.sql;

So, if mysql.proc table needs to be upgraded, stored procedures
can not be used in mysql_system_tables.sql.

In other words, in mysql_system_tables.sql stored programs must
not be used because they may be unavailable at this point.

The fix is to use dynamic SQL instead of stored programs.

There is no test case for this bug because our test suite
is not suitable for such test cases. system_mysql_db_fix* test
cases play with the database "test". Here we need to modify
the system database and we can not do that in the test suite.
2007-07-26 20:05:01 +04:00
jperkin@production.mysql.com
d2936fad10 mysql_install_db.sh:
Fix error in previous change, correct --language argument.
2007-07-26 14:31:11 +02:00
jperkin@production.mysql.com
2c95b97787 Apply a few more cleanups to improve the robustness of mysql_install_db 2007-07-26 14:27:36 +02:00
jperkin@production.mysql.com
8f87bd6008 Clean up the mysql_install_db script to ensure that a sane environment is
available and reduce the chance of failure.  This should fix bug#28585
which is caused by the script being quite random in how it finds files it
requires and not giving very good feedback to the user about what went
wrong.

Also update make_binary_distribution so that it provides the correct path
to the required SQL scripts when generating mysql_install_db.  The script
only previously worked because of the permissive behaviour which looked
around the current working directory before the "correct" location.  This
could lead to severe problems if the user happened to run the script from
a location which contained older or even broken copies of the SQL scripts.

We now require either a complete binary release (and the mysql_install_db
script ran from inside the extracted archive), or an installed compiled
tree, as this is the only way we can be sure everything that we need is
available and ready to run.

While working on this fix, also clean up the mysql_install_db script a lot
to make it simpler, easier to read, and hopefully less prone to bugs in
the future.
2007-07-26 12:57:46 +02:00
df@pippilotta.erinye.com
3c2baf3e66 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-07-20 11:41:25 +02:00
df@pippilotta.erinye.com
a51493a4a0 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-07-20 09:20:48 +02:00
joerg@trift2.
59588dff9a Merge trift2.:/MySQL/M50/bug21023-25486-5.0
into  trift2.:/MySQL/M51/bug21023-25486-5.1
2007-07-17 21:11:22 +02:00
joerg@trift2.
cb28594deb Ensure "mysql-stress-test.pl" is included in both "tar.gz" and RPM packages.
Fixing bug#21023:  "mysql-stress-test.pl" missing in builds
2007-07-17 16:25:32 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
0e98bed903 make_binary_distribution.sh:
BUG#29382
2007-07-17 10:25:48 +02:00
tsmith@sita.local
63dd4251e4 Bug #29634: mysqld_safe does not set err_log variable, error log file is not created
Dont touch & chmod the err_log file if using syslog (mysqld_safe)
2007-07-09 16:10:43 -06:00
tsmith@sita.local
e345a242f4 mysqld_safe.sh:
Fix a few typos in comments (from Paul DuBois)
2007-07-09 15:30:19 -06:00
tsmith@maint1.mysql.com
54253a0763 Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-07-04 22:38:53 +02:00
msvensson@pilot.(none)
ef80d45d0d Update make_win_bin_dist to also copy mysql-test/suite directory 2007-06-29 14:43:54 +02:00
anozdrin/alik@ibm.
9fae9ef66f Patch for the following bugs:
- BUG#11986: Stored routines and triggers can fail if the code
    has a non-ascii symbol
  - BUG#16291: mysqldump corrupts string-constants with non-ascii-chars
  - BUG#19443: INFORMATION_SCHEMA does not support charsets properly
  - BUG#21249: Character set of SP-var can be ignored
  - BUG#25212: Character set of string constant is ignored (stored routines)
  - BUG#25221: Character set of string constant is ignored (triggers)

There were a few general problems that caused these bugs:
1. Character set information of the original (definition) query for views,
   triggers, stored routines and events was lost.
2. mysqldump output query in client character set, which can be
   inappropriate to encode definition-query.
3. INFORMATION_SCHEMA used strings with mixed encodings to display object
   definition;

1. No query-definition-character set.

In order to compile query into execution code, some extra data (such as
environment variables or the database character set) is used. The problem
here was that this context was not preserved. So, on the next load it can
differ from the original one, thus the result will be different.

The context contains the following data:
  - client character set;
  - connection collation (character set and collation);
  - collation of the owner database;

The fix is to store this context and use it each time we parse (compile)
and execute the object (stored routine, trigger, ...).

2. Wrong mysqldump-output.

The original query can contain several encodings (by means of character set
introducers). The problem here was that we tried to convert original query
to the mysqldump-client character set.

Moreover, we stored queries in different character sets for different
objects (views, for one, used UTF8, triggers used original character set).

The solution is
  - to store definition queries in the original character set;
  - to change SHOW CREATE statement to output definition query in the
    binary character set (i.e. without any conversion);
  - introduce SHOW CREATE TRIGGER statement;
  - to dump special statements to switch the context to the original one
    before dumping and restore it afterwards.

Note, in order to preserve the database collation at the creation time,
additional ALTER DATABASE might be used (to temporary switch the database
collation back to the original value). In this case, ALTER DATABASE
privilege will be required. This is a backward-incompatible change.

3. INFORMATION_SCHEMA showed non-UTF8 strings

The fix is to generate UTF8-query during the parsing, store it in the object
and show it in the INFORMATION_SCHEMA.

Basically, the idea is to create a copy of the original query convert it to
UTF8. Character set introducers are removed and all text literals are
converted to UTF8.

This UTF8 query is intended to provide user-readable output. It must not be
used to recreate the object.  Specialized SHOW CREATE statements should be
used for this.

The reason for this limitation is the following: the original query can
contain symbols from several character sets (by means of character set
introducers).

Example:

  - original query:
    CREATE VIEW v1 AS SELECT _cp1251 'Hello' AS c1;

  - UTF8 query (for INFORMATION_SCHEMA):
    CREATE VIEW v1 AS SELECT 'Hello' AS c1;
2007-06-28 21:34:54 +04:00
df@pippilotta.erinye.com
6db1887a5c fix make_win_bin_dist typo 2007-06-13 19:19:11 +02:00
kent@mysql.com/kent-amd64.(none)
affeddbd8f make_win_bin_dist:
Aligned headers to include with Unix 'make install'
2007-06-12 19:49:02 +02:00
tsmith@quadxeon.mysql.com
c1c60a17dc Merge tsmith.mysql.internal:m/bk/maint/b4858/51
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-31 00:29:02 +02:00
tsmith@quadxeon.mysql.com
91c484339c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-30 23:48:20 +02:00
msvensson@pilot.blaudden
7327f42060 Merge pilot.blaudden:/home/msvensson/mysql/bug28521/my51-bug28521
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-24 12:31:48 +02:00
df@pippilotta.erinye.com
d29eaed81a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-24 09:22:00 +02:00
joerg@trift2.
b8e3fb1333 Merge trift2.:/MySQL/M50/bug26609-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-05-22 20:02:23 +02:00
joerg@trift2.
49dc9c5971 Merge trift2.:/MySQL/M50/bug26609-5.0
into  trift2.:/MySQL/M51/bug26609-5.1
2007-05-22 17:51:51 +02:00
joerg@trift2.
b0677f1ddc scripts/make_binary_distribution.sh :
Include all the additional test suites in the binary packages ("tar.gz").
This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
2007-05-22 17:06:47 +02:00