mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41243 commits 2788 branches 343 tags 1.7 GiB
Commit graph

2606 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
kostja@bodhi.local
2525e16c73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-29 11:44:37 +03:00
baker@bk-internal.mysql.com
f175a892ab Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-28 22:22:52 +01:00
msvensson@neptunus.(none)
cc747a02b3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 21:11:05 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 20:59:57 +01:00
kent@kent-amd64.(none)
2264dc7da0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-28 18:31:53 +01:00
gkodinov@dl145s.mysql.com
32c9e11df9 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-28 17:14:16 +01:00
monty@mysql.com/nosik.monty.fi
9c3a2a0d8e Increased heap max length to > 4G for 64 bit machines 
Initialize key_part->type on open. This caused key_copy() to fail for bit_fields. (key_copy is used in HANDLER and opt_range)
 2006-11-28 00:47:21 +02:00
kent@kent-amd64.(none)
e99c548bcd Merge mysql.com:/home/kent/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.1
 2006-11-27 23:12:05 +01:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.0-merge
 2006-11-27 21:45:16 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c48c8e9015 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into  mysql.com:/Users/kent/mysql/bk/build/mysql-5.0-build
 2006-11-27 19:09:21 +01:00
monty@mysql.com/nosik.monty.fi
0e149b7170 Removed compiler warnings 
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
 2006-11-27 18:16:08 +02:00
gkodinov@dl145s.mysql.com
e74c9add47 Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-27 16:25:52 +01:00
msvensson@neptunus.(none)
a6ce7b89a9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-27 10:48:41 +01:00
monty@nosik.monty.fi
becf45cd8e Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-27 01:51:50 +02:00
msvensson@neptunus.(none)
86f0d1bb03 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-24 12:12:25 +01:00
msvensson@neptunus.(none)
0e4d97edf0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-23 18:38:27 +01:00
msvensson@neptunus.(none)
7053ef84bf Rework my_getpagesize function 
- 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
 2006-11-23 17:23:29 +01:00
monty@mysql.com/nosik.monty.fi
fb9bb62b1e Added some missing DBUG_RETURN 
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
 2006-11-23 16:41:21 +02:00
msvensson@neptunus.(none)
bc59087a9a Add define for my_getpagesize to 8192(reworked in 5.0) 2006-11-23 12:06:04 +01:00
anozdrin/alik@booka.
0a1a704f17 Make IM compiled on Win32: add pthread_join() impl. 2006-11-22 17:14:43 +03:00
baker@bk-internal.mysql.com
098571df33 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-22 05:54:30 +01:00
holyfoot/hf@deer.(none)
7d190dd6b1 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/mysql-5.1-mrg
 2006-11-17 19:01:35 +04:00