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

803 commits

Author SHA1 Message Date
knielsen@mysql.com
a729d7fcdd Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-05-16 14:34:35 +02:00
knielsen@mysql.com
b6ee2d2340 Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix 
into  mysql.com:/usr/local/mysql/tmp-5.0
 2006-05-15 19:57:12 +02:00
knielsen@mysql.com
fc16aff742 Fix two Valgrind memory leak warnings. 2006-05-15 18:07:18 +02:00
msvensson@neptunus.(none)
46f1f3ed2c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 11:19:37 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
msvensson@neptunus.(none)
47a578f4e4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 08:45:22 +02:00
reggie@big_geek.
67a692f998 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 
This is being pushed to a private tree and tested before being sent to the mainline.
 2006-05-11 11:29:08 -05:00
msvensson@neptunus.(none)
b60540a862 Remove valgrind and compiler warnings 
Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
 2006-05-08 17:14:06 +02:00
msvensson@neptunus.(none)
29ace143a1 Backport fix for mysql client not using SSl library directly 
- Add function mysql_get_ssl_cipher
 - Use function mysql_get_ssl_cipher from mysql
 2006-04-22 00:48:13 +02:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
msvensson@shellback.
afaa4e2be5 Merge 192.168.0.10:mysql/mysql-5.1 
into  shellback.:C:/mysql/my51-bug17368
 2006-04-11 12:19:28 +02:00
msvensson@shellback.
c5a23958f6 Make line endings consistent, use Unix format 2006-04-10 20:04:36 +02:00
msvensson@neptunus.(none)
5770973b72 Merge 192.168.0.20:mysql/bug15069/my51-bug15069 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-10 15:14:47 +02:00
msvensson@neptunus.(none)
6b1f72c1a7 Merge 192.168.0.20:mysql/bug15069/my50-bug15069 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-10 15:13:30 +02:00
msvensson@shellback.(none)
1e2de60439 Merge shellback.(none):/home/msvensson/mysql/bug15069/my50-bug15069 
into  shellback.(none):/home/msvensson/mysql/bug15069/my51-bug15069
 2006-04-10 15:13:11 +02:00
msvensson@shellback.(none)
475e1f6a53 Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir 
- Grab the path from "configure --sysconfdir=<path>" and set it as
   the first place to look for my.cnf files
   Do this both in Makefiles for libmysql and mysys
 - Patch provided by Francesco Riosa. Thank you!
 2006-04-10 15:11:37 +02:00
msvensson@neptunus.(none)
24a6dd64b5 Update implementation of new function 'mysql_get_ssl_cipher' after review 2006-04-10 12:23:20 +02:00
bar@mysql.com
0524cdbe70 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-06 13:08:07 +05:00
bar@mysql.com
13b5cdb126 Moving mysql_get_server_version() from libmysql.c to client.c, 
as it is now required by mysql_set_character_set()
 2006-04-06 13:03:22 +05:00
bar@mysql.com
45a3bb57d6 libmysql.c: 
Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.
 2006-04-06 11:47:46 +05:00
kent@mysql.com
1f88c4e5df Merge mysql.com:/Users/kent/mysql/bk/tmp_merge 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-05 10:39:44 +02:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
serg@serg.mylan
a1bf113868 yassl link problem fixed 2006-04-03 12:07:18 +02:00
kent@mysql.com
f5a9cc17a1 Makefile.am, yassl.m4: 
Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
 2006-04-01 01:24:28 +02:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from 
a normal 'make dist' source .tar.gz.
 2006-03-24 22:50:56 +01:00
knielsen@mysql.com
9c84881310 Define USE_TLS when compiling libmysql.dll, to avoid crashing when 
loaded at runtime.
 2006-03-22 09:55:26 +01:00
georg@lmy002.wdf.sap.corp
556fbe7d68 fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163) 
(approved by kostja)
 2006-03-21 22:02:36 +01:00
knielsen@mysql.com
8567553bcb Fix Windows CMake compilation after merge of Magnuses ssl patch. 2006-03-16 16:57:24 +01:00
knielsen@mysql.com
ca4ec28146 CMake Windows comp_error dependency fix after last push. 2006-03-16 15:42:48 +01:00
knielsen@mysql.com
24e29bf9d1 Fix Windows CMake dependency problem. 2006-03-16 13:30:59 +01:00
Reggie@xgeek.
11979eec94 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06:00
anozdrin@mysql.com
0e172496eb Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-tree 
into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree
 2006-03-10 22:37:38 +03:00
konstantin@mysql.com
2ea0b9b72c Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error": 
it breaks binary compatibility. The patch will be left intact
in 5.1.
 2006-03-05 00:38:54 +03:00
konstantin@mysql.com
951943c22a Undo the patch for Bug#16144 "mysql_stmt_attr_get type error", 
it breaks binary compatibility. The patch will be left intact
in 5.1. Warning: this changeset should be null-merged into 5.1.
A separate commit in order to push into the release clone of 
5.0.19.
 2006-03-04 23:04:48 +03:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it 
(Needed for "list of pushes" web page and autopush)
 2006-02-24 18:34:15 +02:00
msvensson@neptunus.(none)
e919f8e888 Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:50:26 +01:00
msvensson@neptunus.(none)
25c4344656 Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057 
into  neptunus.(none):/home/msvensson/mysql/bug14057/my51-bug14057
 2006-02-21 08:49:21 +01:00
msvensson@neptunus.(none)
56acf0a0c2 Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different ways 
- Retry the ping if reconnect is turned on and the error was CR_SERVER_LOST
 2006-02-16 13:44:56 +01:00
jimw@mysql.com
d33b03abef Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-15 12:06:20 -08:00
jimw@mysql.com
28a88a07ce Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-15 11:22:03 -08:00
msvensson@neptunus.(none)
12b23630db Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-15 20:16:33 +01:00
msvensson@devsrv-b.mysql.com
eb97818627 Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000' 
- Init sql_state in mysql_stmt_init
 2006-02-15 13:45:03 +01:00
serg@serg.mylan
48b8e842ca Automerge 2006-02-15 00:01:46 +01:00
serg@serg.mylan
63cfd11859 dbug changes: 
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
 2006-02-14 22:36:11 +01:00
msvensson@neptunus.(none)
e486d81a52 Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-13 10:56:45 +01:00
msvensson@neptunus.(none)
5000951ab4 Bug#14013 mysql_stmt_store_result() bombs if a cursor is open 
- Add code to 'mysql_stmt_store_result' to allow it to be called on 
   a prepared statement with open server side cursor.
 - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
 2006-02-10 14:50:29 +01:00
konstantin@mysql.com
5ed755d0d8 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 23:53:45 +03:00
konstantin@mysql.com
9f0bb47f87 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 23:27:06 +03:00
konstantin@mysql.com
98091b152a Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-02-02 18:17:18 +03:00