summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Merged the fix for bug #11936829 to 5.5.11 release Georgi Kodinov2011-03-311-0/+1
| | | | | | | | | | | | | | Bug #11936829: DIFF. BETWEEN MYSQL.USER (AUTHENTICATION_STRING) IN FRESH AND UPGRADED 5.5.11 There was no modification for pre 5.5.11 builds that had authentication_string. Thus the column was not upgraded by mysql_upgrade. Fixed by adding an ALTER TABLE MODIFY to update an existing column to the latest type version. Test suite added.
* Bug # 11766011: mysql.user.authentication_string column causes Georgi Kodinov2011-03-182-3/+3
| | | | | | | configuration wizard to fail Made the fields mysql.user.plugin and mysql.user.authentication_string nullable to conform with some older clients doing inserts instead of using the commands.
* BUG#59752 : mysql.user.plugin length (60) vs. mysql.plugin.name length (64)Chuck Bell2011-03-112-3/+3
| | | | | | | | This patch corrects the problem by fixing the definition and alterations of the mysql.user table in the .sql files. Also included are new result files for tests that examine the name column of the mysql.user table.
* MergeKent Boortz2010-12-2912-3/+154
|\
| * MergeKent Boortz2010-12-2913-2/+183
| |\
| | * - Added/updated copyright headersKent Boortz2010-12-2816-4/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed files specific to compiling on OS/2 - Removed files specific to SCO Unix packaging - Removed "libmysqld/copyright", text is included in documentation - Removed LaTeX headers for NDB Doxygen documentation - Removed obsolete NDB files - Removed "mkisofs" binaries - Removed the "cvs2cl.pl" script - Changed a few GPL texts to use "program" instead of "library"
* | | bug#51925: 5.5 installed header file layout is incorrectJonathan Perkin2010-12-171-2/+2
| | | | | | | | | | | | Additional space-in-directory-name protection.
* | | bug#51925: 5.5 installed header file layout is incorrectJonathan Perkin2010-12-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The 'mysql' include sub-directory was copied directly into include/ rather than retaining its own directory. Fix this, and update mysql_config which needs additional logic to detect the correct prefix for includes.
* | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2010-11-242-4/+4
|\ \ \ | |/ /
| * | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-242-5/+5
| |\ \ | | |/
| | * A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- ↵Alexander Nozdrin2010-11-243-5/+5
| | | | | | | | | | | | | | | remove all EXCEPTIONS-CLIENT from all the places.
| * | Bug#55846: Link tests fail on Windows - my_compiler.h missingDavi Arnaut2010-08-241-0/+1
| | | | | | | | | | | | | | | Make the my_compiler.h header, like my_attribute.h, part of the distribution. This is required due to the dependency of the former on the latter (which can undefine __attribute__).
* | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-202-328/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotools-based build system has been superseded and is being removed in order to ease the maintenance burden on developers tweaking and maintaining the build system. In order to support tools that need to extract the server version, a new file that (only) contains the server version, called VERSION, is introduced. The file contents are human and machine-readable. The format is: MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 MYSQL_VERSION_PATCH=8 MYSQL_VERSION_EXTRA=-rc The CMake based version extraction in cmake/mysql_version.cmake is changed to extract the version from this file. The configure to CMake wrapper is retained for backwards compatibility and to support the BUILD/ scripts. Also, a new a makefile target show-dist-name that prints the server version is introduced.
* | | Bug #57551: Live upgrade fails between 5.1.52 -> 5.5.7-rcGeorgi Kodinov2010-11-191-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the server to treat a missing mysql.proxies_priv table as empty. Added some grants to make sure tables are correctly opened when they must be opened. Fixed a mysql_upgrade omission not adding rights to root to execute GRANT PROXY on other users. Removed a redundant CREATE TABLE from mysql_system_tables_fix.sql since it's always executed after mysql_system_tables.sql and the first file has CREATE TABLE in it. Added a test case for the above. Fixed error handling code to close the cursor
* | | add missing COMPONENT to all CMake INSTALL commandsVladislav Vaintroub2010-11-131-1/+1
| | |
* | | Merge mysql-5.5-bugteam --> local bugfixing branchMarc Alff2010-11-083-9/+9
|\ \ \
| * | | Bug #57916: Fix the naming of the proxy_priv tableGeorgi Kodinov2010-11-023-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fixed the name of the table to proxies_priv 2. Fixed the column names to be of the form Capitalized_lowecarse instead of Capitalized_Capitalized 3. Added Timestamp and Grantor columns 4. Added tests to plugin_auth to check the table structure 5. Updated the existing tests
* | | | Bug#57609 performance_schema does not work with lower_case_table_namesMarc Alff2010-11-031-17/+17
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, the performance schema tables were defined in UPPERCASE. This was incompatible with the lowercase_table_names option, and caused issues with the install / upgrade process, when changing the lower case table names setting *after* the install or upgrade. With this fix, all performance schema tables are exposed with lowercase names. As a result, the name of the performance schema table is always lowercase, no matter how / if / when the lowercase_table_names setting if changed.
* | | Bug#57154 Rename THREADS.ID to THREADS.PROCESSLIST_ID in 5.5Marc Alff2010-10-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is to align the 5.5 performance_schema.THREADS table definition with the 5.6 performance_schema.THREADS table, to facilitate the 5.5 -> 5.6 migration later. In the table performance_schema.THREADS: - renamed ID to PROCESSLIST_ID, removed not null - changed NAME from varchar(64) to varchar(128) to match the columns definitions from 5.6 Adjusted the test cases accordingly. Note: this fix is for 5.5 only, to null merge into 5.6
* | | Fix compile error on Windows after WL#1054 push.Vladislav Vaintroub2010-10-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error was introduced by typo in variable name (errormsg instead of correct errmsg) - Also, precache HAVE_PEERCRED to OFF in cmake\os\WindowsCache.cmake (to avoid useless system check). - Also, add missing check for errors from FormatMessage(). - Also, remove annoying CMake debug printout of MALLOC_LIB if this is not set.
* | | mergeGeorgi Kodinov2010-10-041-5/+4
|\ \ \
| * | | Fix bug#56267:Joerg Bruehe2010-10-031-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tcmalloc lib (libtcmalloc_minimal.so) is missing from mysql 5.5 binary Ensure that a "-DMALLOC_LIB=/foo/bar/libtcmalloc_minimal.so" will ensure that this library gets included in the tar.gz binary package. It depends on the build environment to set this variable to the correct path name, if it is available.
* | | | merge of mysql-5.5 into mysql-5.5-wl1054Georgi Kodinov2010-09-204-53/+36
|\ \ \ \ | |/ / /
| * | | Fix bug#56574:Joerg Bruehe2010-09-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After installation from RPM, server is run under root, not mysql user The problem was that in the cmake way of building the variable "MYSQLD_USER" was not set and propagated. In the script "mysqld_safe" its value is used as the name of the user who should run the server process. The fix is to explicitly set this variable to "mysql" and propagate it in the build process. It was analyzed and proposed by Jonathan Perkin.
| * | | Cherry-picking patch for Bug#55846.Alexander Nozdrin2010-08-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original changeset: ------------------------------------------------------------ revno: 3186 revision-id: davi.arnaut@oracle.com-20100831142822-2qhufn3hho4xqr4p parent: gshchepa@mysql.com-20100830222201-ie7n43mjy4irlllk committer: Davi Arnaut <davi.arnaut@oracle.com> branch nick: mysql-5.5-merge timestamp: Tue 2010-08-31 11:28:22 -0300 message: Bug#55846: Link tests fail on Windows - my_compiler.h missing Make the my_compiler.h header, like my_attribute.h, part of the distribution. This is required due to the dependency of the former on the latter (which can undefine __attribute__). ------------------------------------------------------------
| * | | mergeChristopher Powers2010-08-202-0/+1
| |\ \ \
| | * | | Bug#54129 Missing the execute bit for scriptsAlexey Botchkov2010-08-191-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files for cmake had some minor bugs causing this. per-file comments: mysql-test/CMakeLists.txt Bug#54129 Missing the execute bit for scripts use same permissions as in the source folder mysql-test/t/disabled.def Bug#54129 Missing the execute bit for scripts mysqlhotcopy tests enabled scripts/CMakeLists.txt Bug#54129 Missing the execute bit for scripts chmod +x for the script files
| * | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-161-2/+2
| |\ \ \
| * | | | Bug#55416 Renaming of performance_schema tables for 5.5Marc Alff2010-08-121-53/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed table SETUP_OBJECTS. Renamed table PROCESSLIST to THREADS. Renamed table EVENTS_WAITS_SUMMARY_BY_EVENT_NAME to EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME. Adjusted Makefiles, code and tests accordingly.
* | | | | merged mysql-5.5 into WL1054-5.5Georgi Kodinov2010-08-162-38/+35
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-121-2/+2
| |/ / / | | | | | | | | Fixing copyright text.
| * | | Merge to mysql-5.5-bugfixingJonathan Perkin2010-08-102-36/+32
| |\ \ \
| | * | | Don't try to remove from an empty list.Jonathan Perkin2010-08-091-17/+19
| | | | |
| | * | | Apply wlad's fix for bug#55215Jonathan Perkin2010-08-092-36/+30
| | | | |
| * | | | Build cleanupsVladislav Vaintroub2010-08-051-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Simplify sql-bench installation, do not try to resolve names : this leads to probem if builddir is symlink located on different filesystem. (reported by alik) - Make WITHOUT_XXX (disabling plugin) work for DEFAULT plugins. Prior to the patch is behaved just like MANDATORY. - LINK_LIBRARIES in MYSQL_ADD_PLUGIN had no effect for statically linked plugins. - Fix constant rebuild of initdb target on Windows.
* | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-093-5/+20
|/ / / | | | | | | | | | Merged the implementation to a new base tree.
* | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-1/+0
| | | | | | | | | Remove Windows related files which aren't used anymore.
* | | Manual merge from mysql-trunk.Alexander Nozdrin2010-07-193-9/+66
|\ \ \ | | | | | | | | | | | | Conflicts: - scripts/CMakeLists.txt
| * | | We can't rely on mysql_config for core functionality like pluginsJonathan Perkin2010-07-051-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | as it may be part of a separate package. Work out the likliest plugin directory using similar logic to the data directory, and avoid the dependancy.
| * | | Include CMAKE_{C,CXX}_FLAGS.Jonathan Perkin2010-07-051-2/+2
| | | |
| * | | No need to save/restore C*FLAGS, they are only used for one script.Jonathan Perkin2010-07-051-16/+4
| | | | | | | | | | | | | | | | | | | | Use CMAKE_*_FLAGS_RELWITHDEBINFO for C*FLAGS expansion, they are the most likely to contain the flags we need.
| * | | bug#54991: mysqld_safe reports syntax error and skips part of logicJonathan Perkin2010-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | while restarting server TARGET_LINUX must be 'true' or 'false'.
| * | | Put mysqlbug back into bin/Jonathan Perkin2010-06-301-5/+2
| | | |
| * | | bug#52737 plugin_dir is set to /usr/local/mysql/lib/plugin whileJonathan Perkin2010-06-302-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting via mysqld_safe Rather than hardcode the plugin directory, enhance mysql_config to fix plugin path when running a relocated install, and use it to provide the plugin directory to mysqld_safe.
| * | | Copy-pasted the wrong line from configure.in, fix gcc detection.Jonathan Perkin2010-06-291-2/+2
| | | |
| * | | mysqlbug is Unix-only.Jonathan Perkin2010-06-281-4/+3
| | | |
| * | | Try to fix more mysqlbug problems.Jonathan Perkin2010-06-281-5/+42
| | | |
| * | | Expand some variables for mysqlbug.Jonathan Perkin2010-06-281-0/+13
| | | |
* | | | Strip maintainer mode options from the flags written toDavi Arnaut2010-07-151-4/+6
| | | | | | | | | | | | | | | | | | | | mysql_config. Those are mainly warning options intended to monitor the server code and shouldn't be leaked to client code.
* | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-154-320/+103
|\ \ \ \
View Lorry Controller Status