Commit graph

2830 commits

Author SHA1 Message Date
kaa@polly.local
c4dd267700 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-12-18 17:47:48 +03:00
msvensson@maint1.mysql.com
8c3dab2f5d Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint
into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-new-maint
2006-12-18 14:27:51 +01:00
msvensson@shellback.
c3fb91b782 Change windows pthread_cond_timedwait to use an absolute time value 2006-12-18 11:09:47 +01:00
kaa@polly.local
f4d09fa4a0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-12-16 03:17:50 +03:00
kaa@polly.local
61507a3f93 Merge polly.local:/tmp/maint/bug24117/my51-bug24117
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-12-15 13:23:05 +03:00
kaa@polly.local
0af09f10fb Merge polly.local:/tmp/maint/bug24117/my50-bug24117
into  polly.local:/tmp/maint/bug24117/my51-bug24117
2006-12-15 13:10:59 +03:00
msvensson@shellback.
fe341ad904 Add macro for retrieving sec part of "struct timespec"
Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem
2006-12-15 10:41:24 +01:00
monty@mysql.com/narttu.mysql.fi
a6481aa4c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0 Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02:00
tsmith/tim@siva.hindu.god
1feb188721 include/my_pthread.h: Fix botched merge - add struct timespec and set_timespec(), etc. 2006-12-14 15:36:45 -07:00
tsmith/tim@siva.hindu.god
126f004a7f Merge siva.hindu.god:/usr/home/tim/m/bk/50
into  siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-14 12:56:57 -07:00
kaa@polly.local
feb0e3a0f2 Merge polly.local:/tmp/maint/bug24117/my50-bug24117
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-12-14 21:24:52 +03:00
kaa@polly.local
4162e009cb Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
Problem:
When creating a temporary field for a temporary table in create_tmp_field_from_field(), a resulting field is created as an exact copy of an original one (in Field::new_field()). However, Field_enum and Field_set contain a pointer (typelib) to memory allocated in the parent table's MEM_ROOT, which under some circumstances may be deallocated later by the time a temporary table is used.

Solution:
Override the new_field() method for Field_enum and Field_set and create a separate copy of the typelib structure in there.
2006-12-14 20:58:07 +03:00
msvensson@shellback.
c41e307d85 BUG#24687 func_misc test fails on win64
- Use same precision (milliseconds) for all time functions
   used  when calculating time for pthread_cond_timedwait
 - Use 'GetSystemTimeAsFileTime' for both start and curr time
2006-12-14 15:23:44 +01:00
pgalbraith@bk-internal.mysql.com
23f0c6d765 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-09 02:34:42 +01:00
tsmith/tim@siva.hindu.god
50e372d608 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51
2006-12-08 16:39:58 -07:00
lars@black.(none)
4d25b1e1c2 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-12-08 23:54:45 +01:00
lars@black.(none)
d85ca0dc1d Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-12-08 23:41:29 +01:00
lars@mysql.com/black.(none)
e2e3f0e5c3 Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-12-08 23:33:39 +01:00
rafal@quant.(none)
c82cd4a46e Minor fix 2006-12-08 19:23:12 +01:00
rafal@quant.(none)
5d7af856f7 BUG#24507 (rpl_log.test crash slave):
The problem was located to lie inside current NPTL pthread_exit() 
implementation. Race conditions in this code can lead to segmentation
fault. Hovewer, this can happen only in a race between first thread 
calling pthread_exit() and other threads. 

Workaround implemented in this patch spawns a dummy thread, which
exits immediately, during thread lib initialization. This will exclude
segment violations when further threads exit.
2006-12-08 11:41:12 +01:00
cmiller@zippy.cornsilk.net
38346fa9da Having MYSQL_VERSION_ID defined correctly made this KILL_QUERY enum item visible. This is a
forwards-incompatible change.
2006-12-07 12:53:32 -05:00
cbell/Chuck@suse.vabb.com
9f36c1c286 WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
Please see worklog for details on files changed.
2006-12-07 09:18:35 -05:00
jpipes@shakedown.(none)
421533e156 Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
2006-12-07 08:49:53 -05:00
jpipes@shakedown.(none)
07ee2594e5 Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_com.h)
MYSQL_VERSION_ID is tested before it has been defined.  This leads to
a warning when compiling with -Wundef and it also will break the
internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
50000.

The fix entailed a simple re-ordering of included files in mysql.h
2006-12-06 19:13:00 -05:00
svoj@mysql.com/april.(none)
3cfd578ea7 BUG#23526 - show table status reports incorrect values for MyISAM tables
This problem could happen when show table status get outdated copy
of TABLE object from table cache.

MyISAM updates state info when external_lock() method is called. Though
I_S does not lock a table to avoid deadlocks. If I_S opens a table which
is in a table cache it will likely get outdated state info copy.

In this case shared state copy is more recent than local copy. This problem
is fixed by correctly restoring myisam state info pointer back to original
value, that is to shared state.

Affects MyISAM only. No good deterministic test case for this fix.
2006-12-05 18:44:14 +04:00
svoj@mysql.com/april.(none)
162f14433b BUG#23255 - Missing version parameter in plugin declaration example
Plugin interface version was not raised properly after incompatible
changes to plugin structure were introduced.

Fixed plugin interface version according to worklog 2761.
2006-12-05 18:05:53 +04:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
971c783f7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
baker@bk-internal.mysql.com
dbe5f0acc5 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-03 21:19:35 +01:00
mskold/marty@linux.site
a63d255bac Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-03 17:03:01 +01:00
kent@mysql.com/kent-amd64.(none)
4dc1132159 Makefile.am:
Disabled abi_check, as it was before merge
2006-12-03 00:25:52 +01:00
kent@kent-amd64.(none)
2b5e2230bb Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-12-02 23:22:53 +01:00
kent@mysql.com/kent-amd64.(none)
d72b71ef9f mysql_install_db.sh:
If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
2006-12-02 23:16:47 +01:00
brian@zim.(none)
31d67280f7 This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
mskold/marty@linux.site
6f0e7a2631 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 21:12:13 +01:00
df@kahlann.erinye.com
887717c454 fix build failure introduced by 5.1-marvel merge 2006-12-01 14:25:32 +01:00
monty@narttu.mysql.fi
693b906f6e Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-11-30 23:27:16 +02:00
monty@narttu.mysql.fi
430d215c58 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-11-30 22:38:12 +02:00
monty@mysql.com/narttu.mysql.fi
3d40956039 Fixed portability issue in my_thr_init.c (was added in my last push)
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.
2006-11-30 18:25:05 +02:00
mskold/marty@linux.site
d7e375680a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 15:31:20 +01:00
monty@mysql.com/narttu.mysql.fi
3a35c30027 Fixed compiler warnings (Mostly VC++):
- 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)
2006-11-30 03:40:42 +02:00
baker@bk-internal.mysql.com
082de8dfce Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-30 01:45:16 +01:00
monty@narttu.mysql.fi
717284b85c Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-11-29 23:07:15 +02:00
kostja@bodhi.local
966c569b94 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-29 23:36:26 +03:00
monty@mysql.com/narttu.mysql.fi
0bee93e038 Ignore some generated files
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)
2006-11-29 22:14:08 +02:00
baker@bk-internal.mysql.com
94dc5d5379 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-29 18:31:13 +01:00
monty@mysql.com/narttu.mysql.fi
8aec636ba8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-11-29 17:25:23 +02:00
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 15:44:09 +01:00
kent@kent-amd64.(none)
65183d54d2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 14:28:05 +01:00