summaryrefslogtreecommitdiff
path: root/storage
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2007-06-01135-1434/+1445
|\ | | | | | | into bodhi.(none):/opt/local/work/mysql-5.1-runtime
| * Added casts to avoid compiler warnings and fixed a wrong type.jani@a88-113-38-195.elisa-laajakaista.fi2007-05-313-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- Added casts and fixed wrong type. --- Added casts and fixed wrong type. --- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel --- Don't give warning that readonly variable is forced to be readonly mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file Fixed wrong reference to the mysql manual Fixed wrong prototype that caused some tests to fail on 64 bit platforms --- Disabled compiler warnings mainly for Win 64. --- Added casts to remove compiler warnings on windows Give warnings also for safe_mutex errors found by test system Added some warnings from different machines in pushbuild --- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into mysql.com:/home/my/mysql-5.1 --- Added escapes for double quotes and parenthesis. --- Archive db fix plus added non-critical warnings in ignore list. --- Fixed previously added patch and added new ignored warning.
| * Merged from main 5.1jani@linux-th5m.site2007-05-241-7/+7
| |
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@linux-th5m.site2007-05-24135-1426/+1433
| |\ | | | | | | | | | into linux-th5m.site:/home/my/mysql-5.1-marvel
| | * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-24135-1426/+1433
| | |\ | | | | | | | | | | | | 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-10135-1442/+1429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
* | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2007-05-281-8/+17
|\ \ \ \ | |/ / / |/| | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| * | | Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpllars/lthalmann@dl145h.mysql.com2007-05-241-8/+17
| | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
* | | | Merge mysql.com:/home/svoj/devel/bk/mysql-5.1svoj@june.mysql.com2007-05-235-23/+143
|\ \ \ \ | |_|/ / |/| | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
| * | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-enginessvoj@april.(none)2007-05-171-6/+7
| | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.1-engines
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-05-102-5/+10
| |\ \ \ | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-bug17332
| | * | | Bug#17332 - changing key_buffer_size on a running serveristruewing@chilla.local2007-03-231-31/+9
| | | | | | | | | | | | | | | | | | | | | | | | | can crash under load After review fixes
| | * | | Merge chilla.local:/home/mydev/mysql-5.1-bug17332-oldistruewing@chilla.local2007-03-202-1/+28
| | |\ \ \ | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-bug17332
| | | * | | Bug#17332 - changing key_buffer_size on a running serveristruewing@chilla.local2007-01-312-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can crash under load Resizing a key cache while it was in heavy use could crash the server. There were several race conditions. I reworked some of the algorithms to fix the race conditions. No test case. Repeating the crashes requires heavy concurrent load on the key cache. A test script is attached to the bug report. More explanations to the changes are contained in a text file attached to the bug report.
| * | | | | Bug#26241acurtis/antony@xiphis.org/ltamd64.xiphis.org2007-05-082-12/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Blackhole tables don't honor table locks" Implement neccessary shared lock structure for table locks. Imported test case created by Giuseppe Maxia
* | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1tomas@whalegate.ndb.mysql.com2007-05-2227-490/+1141
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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-05-225-9/+47
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| | * | | | | | Bug #28593 cluster backup scans in acc index order, bad for disk datatomas@whalegate.ndb.mysql.com2007-05-225-9/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - change to scan in tup and disk order (if applicable)
| * | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1tomas@whalegate.ndb.mysql.com2007-05-211-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbtomas@whalegate.ndb.mysql.com2007-05-217-25/+93
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| | * \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcajonas@perch.ndb.mysql.com2007-05-181-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
| | | * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2007-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
| | * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcajonas@perch.ndb.mysql.com2007-05-181-4/+6
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
| | | * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2007-05-181-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
| | * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcajonas@perch.ndb.mysql.com2007-05-186-19/+85
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
| | | * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2007-05-186-19/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
| | * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcajonas@perch.ndb.mysql.com2007-05-171-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
| | | * | | | | | | | ndb - bug#28491jonas@perch.ndb.mysql.com2007-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable "disable expand check" as it does not solve problems anyway
| * | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbtomas@whalegate.ndb.mysql.com2007-05-156-6/+372
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| | * | | | | | | | | ndb - bug#24631jonas@perch.ndb.mysql.com2007-05-156-6/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add Dbdict::restartDropObj*
| * | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-05-151-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-05-152-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-05-153-1/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcajonas@perch.ndb.mysql.com2007-05-144-1/+103
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
| | * | | | | | | | ndb - bug#28348jonas@perch.ndb.mysql.com2007-05-144-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove LCP files when dropping table
| * | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbmikael@dator3.(none)2007-05-105-438/+491
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dator3.(none):/home/mikael/mysql_clones/rt-5.1
| | * \ \ \ \ \ \ \ \ Merge mikael@192.168.0.203:/home/mikael/mysql_clones/rt-5.1mikron@mikael-ronstr-ms-dator.local2007-05-085-438/+491
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
| | | * | | | | | | | | Jammingmikron@mikael-ronstr-ms-dator.local2007-05-073-254/+441
| | | | | | | | | | | |
| | | * | | | | | | | | Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndbmikron@mikael-ronstr-ms-dator.local2007-05-072-184/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
* | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-05-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
| * | | | | | | | | | | Comment fix.kostja@vajra.(none)2007-05-161-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttsmith@siva.hindu.god2007-05-1727-458/+836
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/51
| * \ \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/51tsmith@siva.hindu.god2007-05-1727-458/+836
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/51
| | * | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opttomas@whalegate.ndb.mysql.com2007-05-1017-76/+322
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| | | * | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-05-095-7/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| | | * | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-05-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| | | * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcajonas@perch.ndb.mysql.com2007-05-083-0/+103
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | / / / / / / | | | | | |/ / / / / / | | | | |/| | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
| | | | * | | | | | | ndb - bug#20535jonas@perch.ndb.mysql.com2007-05-083-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set null bits on delete+insert
| | | * | | | | | | | Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjgni@dev3-221.dev.cn.tlan2007-05-086-9/+78
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb