summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Collapse)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-12-061-0/+1
|\ | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
| * Flush stderr after print of error message to get predictable outputmsvensson@neptunus.(none)2006-12-061-0/+1
| |
| * Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-043-19/+84
| |\ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
* | \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-12-045-10/+48
|\ \ \ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
| * \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-301-1/+5
| |\ \ \ | | |/ / | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
| | * | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-11-301-1/+5
| | |\ \ | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| | | * | Bug#10608 mysqladmin breaks on "database" variable in my.cnfmsvensson@neptunus.(none)2006-11-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | - Add printout of "Warning" or "Note" for non error messages in default_reporter - Add test for the above in new mysqladmin.test
| | | * | Fix merge collision.cmiller@zippy.cornsilk.net2006-11-021-4/+4
| | | | |
| | | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.cornsilk.net2006-11-0211-42/+217
| | | |\ \ | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
| | | | * | Bug#22828 complementary patch:thek@kpdesk.mysql.com2006-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - 'false' not defined in C, use FALSE instead.
| | * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-2825-80/+91
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * | \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-11-2929-89/+111
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
| * | | | | | | Add my_getpagesize.c as source for mysysmsvensson@neptunus.(none)2006-11-271-1/+1
| | | | | | | |
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-273-8/+42
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
| | * | | | | | Rework my_getpagesize functionmsvensson@neptunus.(none)2006-11-234-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Put 'my_getpagesize' in it's own .c file - Map the call 'my_getpagesize' directly to 'getpagesize' if it exists - Add default implementation for 'my_getpagesize' to be used if no platform specfic function exists
* | | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1mskold/marty@linux.site2006-12-015-24/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
| * \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-302-3/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | * | | | | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2006-11-301-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't assert if my_thread_end() is called twice (common case)
| | * | | | | | | Fixed portability issue in my_thr_init.c (was added in my last push)monty@mysql.com/narttu.mysql.fi2006-11-303-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warnings (detected by VC++): - Removed not used variables - Added casts - Fixed wrong assignments to bool - Fixed wrong calls with bool arguments - Added missing argument to store(longlong), which caused wrong store method to be called.
| * | | | | | | | Don't abort if we call my_thread_end() multiple timesmonty@mysql.com/narttu.mysql.fi2006-11-301-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed new introduced bug in my_time.c
| * | | | | | | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-303-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed not used variables - Changed some ulong parameters/variables to ulonglong (possible serious bug) - Added casts to get rid of safe assignment from longlong to long (and similar) - Added casts to function parameters - Fixed signed/unsigned compares - Added some constructores to structures - Removed some not portable constructs Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" (Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
| * | | | | | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-291-11/+39
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | * | | | | | | Ignore some generated filesmonty@mysql.com/narttu.mysql.fi2006-11-291-10/+40
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't return from my_thread_global_end() until all threads have called my_thread_end() Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
| * | | | | | | Added back sql-bench directory, so that one can more easily run benchmarks ↵monty@mysql.com/narttu.mysql.fi2006-11-291-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on a server and add new benchmarks for new optimizations Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option) Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file" BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
* | | | | | | Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjgni/root@ts3-168.ts.cn.tlan2006-12-011-2/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
| * | | | | | | ndb - fixed for BUG#15021, binlog_index table become inconsistent if errors ↵dli@dev3-76.dev.cn.tlan2006-10-131-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during purge of binlogs. if EMFILE error occured while purging binary logs, stop purging logs and report error message to user.
* | | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1mskold/marty@linux.site2006-11-3029-89/+111
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
| * | | | | | | Disabled syncronization test at it fails on multiple platforms. (Bug #24529)monty@mysql.com/nosik.monty.fi2006-11-272-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that test_thr_alarm works
| * | | | | | | Fixed a LOT of compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-272-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing DBUG_RETURN statements (in mysqldump.c) Added missing enums Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
| * | | | | | | Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-2222-76/+80
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | * | | | | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-2025-80/+91
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #)
| | * | | | | Bug#22828 complementary patch:thek@kpdesk.mysql.com2006-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 'false' not defined in C, use FALSE instead.
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@nosik.monty.fi2006-11-213-1/+17
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | * | | | | Added --debug-info to most clients to detect memory leaks in mysql-test-runmonty@mysql.com/nosik.monty.fi2006-11-213-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved .progress files into the log directory Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23 Fixed some compiler warnings Fixed small memory leak in libmysql Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
* | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1mskold/marty@linux.site2006-11-1014-147/+228
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-11-0214-147/+228
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
| | * | | | | Bug#22828 complementary patch:thek@kpdesk.mysql.com2006-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 'false' not defined in C, use FALSE instead.
| | * | | | | Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maintthek@kpdesk.mysql.com2006-11-024-20/+153
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
| | | * | | | Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maintthek@kpdesk.mysql.com2006-11-014-20/+153
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
| | | | * | | Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828thek@kpdesk.mysql.com2006-11-014-20/+153
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
| | | | | * | | Bug#22828 _my_b_read() ignores return values for my_seek() callsthek@kpdesk.mysql.com2006-10-314-20/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Because my_seek actually is capable of returning an error code we should exploit that in the best possible way. - There might be kernel errors or other errors we can't predict and capturing the return value of all system calls gives us better understanding of possible errors.
| | | | * | | | Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/41tsmith/tim@siva.hindu.god2006-10-167-22/+64
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/41
| | | * | \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-10-241-82/+500
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/50
| | | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-10-111-82/+500
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.0-bug8283
| | | * | \ \ \ \ \ \ Merge naruto.:C:/cpp/bug23010/my50-bug23010Kristofer.Pettersson@naruto.2006-10-172-3/+12
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into naruto.:C:/cpp/mysql-5.0-maint
| | | * \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/50tsmith/tim@siva.hindu.god2006-10-167-22/+64
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
| | | * | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-10-031-29/+19
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * | \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-10-2312-127/+75
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/51
| | | * \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-10-1712-127/+75
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
| | | | * \ \ \ \ \ \ \ \ \ \ Merge naruto.:C:/cpp/bug23010/my51-bug23010Kristofer.Pettersson@naruto.2006-10-172-3/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into naruto.:C:/cpp/mysql-5.1-new-maint
View Lorry Controller Status