mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 14:32:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44993 commits 2783 branches 343 tags 1.6 GiB
Commit graph

516 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
fc904eaead Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-02 11:15:09 +02:00
msvensson@pilot.blaudden
04c4cdde1c Import yaSSL 2007-03-28 18:47:51 +02:00
msvensson@pilot.blaudden
1ccf651a3a Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-28 15:57:27 +02:00
msvensson@pilot.blaudden
f8b3241726 Set yaSSL to use same type as MySQL do for socket handles 2007-03-28 15:34:52 +02:00
msvensson@pilot.blaudden
f4ab12e859 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-23 17:15:44 +01:00
msvensson@pilot.blaudden
a1e7778642 Import patch from yaSSL after fixing warnings upstream 2007-03-23 16:41:17 +01:00
msvensson@pilot.blaudden
85aa1bec89 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-23 13:43:09 +01:00
msvensson@pilot.blaudden
7216b67a8c Import yassl 1.6.0 2007-03-23 11:52:25 +01:00
joerg@trift2.
2e5e79cf37 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-03-23 10:57:17 +01:00
kent@kent-amd64.(none)
5018fa3638 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-22 16:58:46 +01:00
kent@mysql.com/kent-amd64.(none)
056356db05 Makefile.am: 
Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
 2007-03-22 16:53:37 +01:00
msvensson@pilot.blaudden
7c5df4d35b Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:24:50 +01:00
msvensson@pilot.blaudden
273eb9bd72 my_print_default does not need to be linked with odbc32.lib(and friends) 2007-03-20 18:37:09 +01:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 17:58:30 +01:00
kent@mysql.com/kent-amd64.(none)
19a6a09126 Many files: 
Major cleanup of old Visual Studio project files, aligning engines etc
 2007-03-19 16:18:10 +01:00
tsmith@quadxeon.mysql.com
0303429257 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-08 08:17:12 +01:00
tsmith@quadxeon.mysql.com
fee7ab58c6 comp_err.c: return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning 2007-03-08 08:15:30 +01:00
msvensson@pilot.blaudden
f5778fc73e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 18:12:56 +01:00
msvensson@pilot.blaudden
51a71fb667 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-01 14:53:32 +01:00
msvensson@pilot.blaudden
6a8127c8c7 Merge pilot.blaudden:/home/msvensson/mysql/bug26678/my50-bug26678 
into  pilot.blaudden:/home/msvensson/mysql/bug26678/my51-bug26678
 2007-02-27 14:21:40 +01:00
msvensson@pilot.blaudden
be72518031 Bug#26678 SSL tests fail on win64 
- Import a patch from yaSSL CVS that uses "word" instead
of "unsigned long" in three function's that uses sizeof to find
out the word size being used. NOTE! long is 32 bit also on 
64 bit windows.
 2007-02-27 14:18:12 +01:00
msvensson@pilot.blaudden
b79c217d0e Link comp_err with zlib 2007-02-24 08:19:37 +01:00
monty@mysql.com/narttu.mysql.fi
3d34c6f957 Fixed windows compilation problems 2007-02-24 04:22:34 +02:00
monty@mysql.com/narttu.mysql.fi
520d1b4144 Fixed compilations problems and warnings on windows 2007-02-23 22:48:15 +02:00
msvensson@pilot.blaudden
bb0948d2ef Link comp_err with zlib 2007-02-23 16:51:13 +01:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9 Fixed compiler warnings 
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
 2007-02-23 13:13:55 +02:00
msvensson@pilot.blaudden
4702ad54e5 Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum 
into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
 2007-02-22 16:44:37 +01:00
msvensson@pilot.blaudden
05305f462b Bug #26571 Different format specifiers in errmsg.txt 
- Add check of format specifiers in error message strings
- Update error message text accordingly to be equal between all translations
 2007-02-22 16:41:51 +01:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33 Fixed compiler warnings (for linux and win32 and win64) 
Fixed a couple of usage of not initialized warnings (unlikely cases)
 2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
6946fa682f After merge fixes 
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
 2007-02-21 19:38:40 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-21 14:07:08 +02:00
msvensson@pilot.mysql.com
13f25e80c3 Merge pilot.mysql.com:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum 
into  pilot.mysql.com:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
 2007-02-14 19:34:22 +01:00
msvensson@pilot.mysql.com
67cc343c34 Add check of format specifiers in error message strings 
Update error message text accordingly to be equal between all translations
 2007-02-14 19:31:06 +01:00
msvensson@pilot.mysql.com
19771b410a Fix merge error 2007-02-06 22:00:48 +01:00
msvensson@pilot.mysql.com
7006b2033e Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-06 20:23:28 +01:00
msvensson@neptunus.(none)
5f5b0e9b39 Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-import 
into  neptunus.(none):/home/msvensson/mysql/yassL-import/my51-yassL-import
 2007-02-06 17:34:06 +01:00
msvensson@neptunus.(none)
38fa3ed693 Bug#25988 openssl_1 Test Case Fails 
- Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
   an extension that allow's the email adress of the cert holder.   
 - Imported patch for yaSSL "add email to DN output"
 2007-02-06 16:28:36 +01:00
msvensson@neptunus.(none)
e4001b3b5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 15:46:17 +01:00
msvensson@pilot.mysql.com
544c19b3e6 Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work 
into  pilot.mysql.com:/home/msvensson/mysql/work/my51-work
 2007-01-29 18:48:20 +01:00
msvensson@pilot.mysql.com
26e4f2e506 Bug#25417 "/usr/bin/test" installed from yassl/taocrypt/test 
- It's good to build the test programs for yaSSL to check for undefined
   symbols etc but they should not be installed by "make install"
 2007-01-29 18:46:06 +01:00
msvensson@neptunus.(none)
7a8334edfb Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2007-01-29 17:54:41 +01:00
msvensson@neptunus.(none)
751d00c47e Import latest version of yaSSL 
- Replace SawTooth copyright header with MySQL's
 - Bug#19209 Test 'rpl_openssl' hangs on Windows
 - Spurious "2013 Connection to server lost" errors fixed
   yaSSL doesn't close socket anymore, that is left to the application
 2007-01-29 16:54:40 +01:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
 2007-01-27 03:46:45 +02:00
monty@mysql.com/narttu.mysql.fi
120e3f5ee1 Avoid compiler warnings on powermacg5 
Fixed compilation error when trying to compile libmysqld on powermac
 2007-01-23 16:42:03 +02:00
msvensson@neptunus.(none)
cff8f55088 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-01-22 16:58:21 +01:00
msvensson@neptunus.(none)
1ebe4850d6 Import yaSSL version 1.5.8 
- Includes patch for Bug#25189
 2007-01-22 16:54:40 +01:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-01-22 14:04:40 +02:00
msvensson@neptunus.(none)
4bb6151a7a Add define for used type of third argument to 'accept' - Netware uses size_t 2007-01-22 12:34:39 +01:00
msvensson@neptunus.(none)
6db5790c2b gen_lex_hash does not need to link with odbc32*.lib 2007-01-22 10:41:36 +01:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-11 09:43:44 -05:00