summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | disable teststomas@whalegate.ndb.mysql.com2007-11-011-0/+1
|/ / /
* | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-09-061-0/+3
|\ \ \ | |/ / | | | | | | into gleb.loc:/home/uchum/work/bk/5.1-opt
| * | Bug #30596 GROUP BY optimization gives wrong result ordermhansson/martin@linux-st28.site2007-08-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | The optimization that uses a unique index to remove GROUP BY, did not ensure that the index was actually used, thus violating the ORDER BY that is impled by GROUP BY. Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains a unique index. In case GROUP BY ... ORDER BY null is used, GROUP BY is simply removed.
* | | Merge amd64.(none):/src/mysql-5.1-maintiggy@amd64.(none)2007-08-031-0/+3
|\ \ \ | | | | | | | | | | | | into amd64.(none):/src/mysql-5.1-build_29903
| * | | Bug#29903 The CMake build method does not produce the embedded library.iggy@amd64.(none)2007-08-031-0/+3
| | | | | | | | | | | | | | | | - Changes to correct and test Windows embedded build.
* | | | Merge bk-internal:/home/bk/mysql-5.1-marveldf@pippilotta.erinye.com2007-08-031-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
| * | | Don't save & restore time fields from thd when it's not needed.monty@mysql.com/nosik.monty.fi2007-08-021-0/+1
| | | | | | | | | | | | | | | | Added back setting of 'some_tables_deleted' to not cause deadlocks in mysql_lock_table()
| * | | Added support for 'internal temporary tables' in HEAP tables.monty@mysql.com/nosik.monty.fi2007-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | Now we don't take any mutexes when creating or dropping internal HEAP tables during SELECT. Change buffer sizes to size_t to make keycache 64 bit safe on platforms where sizeof(ulong) != sizeof(size_t)
* | | | Merge amd64.(none):/src/bug24732/my50-bug24732iggy@amd64.(none)2007-07-251-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ / into amd64.(none):/src/bug24732/my51-bug24732
| * | Bug#24732 Executables do not include Vista manifestsiggy@amd64.(none)2007-07-251-0/+1
| | | | | | | | | | | | - Sign executables with MySQL AB security certificate.
* | | Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marveljani@labbari.dsl.inet.fi2007-07-061-2/+3
|\ \ \ | |/ / | | | | | | into labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel
| * | Allow multiple calls to mysql_server_end()monty@mysql.com/narttu.mysql.fi2007-06-201-0/+3
| | | | | | | | | | | | | | | | | | (Part of fix for Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit) Give correct error message if InnoDB table is not found (This allows us to drop a an innodb table that is not in the InnoDB registery)
* | | Embedded Server doesn't build on Windows.iggy@alf.2007-06-151-0/+3
| | | | | | | | | | | | | | | | | | - Add build configuration parameter EMBEDDED_ONLY which will configure the VS solution to produce only mysql embedded binary. - Make necessary updates to successfully compile solution.
* | | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimekostja@bodhi.(none)2007-06-011-1/+0
|\ \ \ | |/ / | | | | | | into bodhi.(none):/opt/local/work/mysql-5.1-runtime
| * | Do not ignore mysqltest language interpreter warnings.kostja@bodhi.(none)2007-06-011-1/+0
| | |
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-1/+3
|\ \ \ | | | | | | | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
| * | | WL#3817: Simplify string / memory area types and make things more consistent ↵monty@mysql.com/narttu.mysql.fi2007-05-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (first part) The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c
* | | | increase heartbeat interval to avoid load related start up issues in ↵tomas@whalegate.ndb.mysql.com2007-05-081-0/+1
|/ / / | | | | | | | | | mysql-test-run
* | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-mainttomas@whalegate.ndb.mysql.com2007-04-241-0/+13
|\ \ \ | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gcatomas@whalegate.ndb.mysql.com2007-04-231-0/+13
| |\ \ \ | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| | * | | new ndb tool to measure replication latencytomas@whalegate.ndb.mysql.com2007-04-231-0/+13
| | | | |
* | | | | Merge recycle.(none):/src/bug24732/my50-bug24732iggy@recycle.(none)2007-04-231-1/+2
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | into recycle.(none):/src/bug24732/my51-bug24732
| * | | Bug#24732 Executables do not include Vista manifestsiggy@recycle.(none)2007-04-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Added script to generate application specific manifest. - Added new CMake MACRO to add customer build events which will first generate a manifest and then embeds that manifest into an executable.
* | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-04-231-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * \ \ \ Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@pilot.blaudden2007-04-181-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-181-0/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | | * | | Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrademsvensson@pilot.blaudden2007-04-181-0/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| | | | * | | Bug#25452 mysql_upgrade access deniedmsvensson@pilot.blaudden2007-04-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve mysql_upgrade and add comments describing it's logic - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade was started from - Don't look for mysql_fix_privilege_tables.sql randomly, compile in the mysql_fix_privilege_tables.sql file and use that to upgrade the system tables of MySQL - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL - Fix bug#26639, bug#24248 and bug#25405
| | | * | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-211-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| | | | * | | | Bug#20166 mysql-test-run.pl does not test system privilege tables creationjoerg@trift2.2007-03-161-0/+2
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Build sql files for netware from the mysql_system_tables*.sq files - Fix comments about mysql_create_system_tables.sh - Use mysql_install_db.sh to create system tables for mysql_test-run-shell - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.
| * | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-usertomas@whalegate.ndb.mysql.com2007-04-161-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
| | * | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508msvensson@pilot.blaudden2007-04-111-1/+5
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | | * | | | | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditmsvensson@pilot.blaudden2007-03-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the link_sources command from top level Makefile into each subdir that need to link files
* | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-rplmats@romeo.(none)2007-04-201-8/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | into romeo.(none):/home/bk/merge-mysql-5.1
| * | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-04-071-1/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| | * | | | | | changed supported sql function to inpuzt files.hhunger@hh-nb.hungers2007-04-051-0/+5
| | | | | | | |
* | | | | | | | revert back to old show_binlog_events asto many test failures, and create a ↵tomas@whalegate.ndb.mysql.com2007-04-181-0/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | show_binlog_events2 instead
* | | | | | | Bug #26783 replication status unknown after cluster or mysqld failuretomas@whalegate.ndb.mysql.com2007-04-031-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | - update the ndb_apply_status table with binlog info
* | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-191-0/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * | | | | Bug#20166 mysql-test-run.pl does not test system privilege tables creationmsvensson@pilot.blaudden2007-03-161-0/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Build sql files for netware from the mysql_system_tables*.sq files - Fix comments about mysql_create_system_tables.sh - Use mysql_install_db.sh to create system tables for mysql_test-run-shell - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-03-011-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * \ \ \ \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-02-231-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| * | | | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb
* | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-02-281-0/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.blaudden2007-02-281-1/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
| | * | | | | Bug#20166 mysql-test-run.pl does not test system privilege tables creationmsvensson@pilot.blaudden2007-02-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Build lib/init-db.sql from the output of mysql_create_system_tables - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql - Leave netware/init_db.sql until 5.0 where we should soon have possibility to test with mysql-test-run.pl
* | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166msvensson@pilot.blaudden2007-02-261-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
| * | | | | Bug#20166 mysql-test-run.pl does not test system privilege tables creationmsvensson@pilot.blaudden2007-02-261-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | - Use mysql_system_tables.sql to create MySQL system tables in all places where we create them(mysql_install_db, mysql-test-run-pl and mysql_fix_privilege_tables.sql)
| * | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0msvensson@pilot.mysql.com2007-02-131-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
| | * | | | copy from test-extra-5.0 to main treehhunger@hh-nb.hungers2007-02-061-0/+1
| | | | | |
View Lorry Controller Status