database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-30 04:26:45 +03:00
Code Activity
62,899 Commits 3,247 Branches 1,092 Tags
734e87ff7b59a13183bb1defaa53b5231e477f1f
Commit Graph

59 Commits

Author SHA1 Message Date
Vladislav Vaintroub
2ff2d1873a merge 2009-12-16 15:34:11 +01:00
Alexander Nozdrin
69cfd5c8ec Manual merge from mysql-trunk. 
Conflicts:
  - client/mysqltest.cc
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/t/disabled.def
  - sql/mysqld.cc
  - sql/opt_range.cc
  - sql/sp.cc
  - sql/sql_acl.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
 2009-12-11 12:39:38 +03:00
Vladislav Vaintroub
afe4ee1e17 implement convenience libraries 2009-11-24 23:15:47 +00:00
Davi Arnaut
ec3e44778d Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 and up. 2009-11-24 19:25:23 -02:00
Alexander Nozdrin
2ca5b2c791 Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
Konstantin Osipov
5f6d811e5a Backport the following revision from 6.0: 
----------------------------------------------------------
revno: 2476.657.210
committer: kostja@bodhi.(none)
timestamp: Tue 2007-12-04 18:27:44 +0300
message:
  Fix a potential linking error with libmysql and libmysqld on Windows:
  remove declarations of removed functions (Bug#31952)
----------------------------------------------------------
 2009-10-09 13:23:56 +04:00
Davi Arnaut
344cd04b1e Bug#41728: Dropped symbol but no soname change 
Restore a stub of the removed mysql_odbc_escape_string function
to fix a ABI breakage. The function was intended to be private
and used only by Connector/ODBC, but, unfortunately, it was exported
as part of the ABI. Nonetheless, only a stub is restored as the
original function is inherently broken and shouldn't be used.

This restoration only applies to MySQL 5.0. This will be addressed
differently in later versions -- reworked library versioning.
 2009-09-29 09:55:53 -03:00
davi@mysql.com/endora.local
cdad8669df Bug#29592 SQL Injection issue 
Remove the mysql_odbc_escape_string() function. The function
has multi-byte character escaping issues, doesn't honor the
NO_BACKSLASH_ESCAPES mode and is not used anymore by the
Connector/ODBC as of 3.51.17.
 2007-11-26 14:09:37 -02: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
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
monty@mishka.local
21ae963205 Fixes to previous changeset 
get_defaults_file() -> get_defaults_options()
 2005-07-18 20:05:30 +03:00
georg@lmy002.wdf.sap.corp
ceba4ee9cd New attempt after Bar's review 
Added api function mysql_get_character_set_info which provides
information about the current client character set.
 2005-07-12 10:31:43 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c63ad3b549 New file default_modify.c. Fixed a typo on mysqld.cc 
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
 2005-05-18 20:10:17 +03:00
georg@lmy002.wdf.sap.corp
b01ad9f88c Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-05-18 13:57:33 +02:00
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04:00
georg@lmy002.wdf.sap.corp
320d9cb4c2 added function mysql_set_character_set (reviewed by Monty) 
as a work around for #8317 and #9637

This function sends SET NAMES command and changes mysql->charset
so mysql_real_escape_string will work as expected.
 2005-05-13 15:06:11 +02:00
georg@lmy002.wdf.sap.corp
03cd2329eb reverted last push - as discussed with Monty we will add 
mysql_set_character_set
 2005-05-13 14:57:33 +02:00
georg@lmy002.wdf.sap.corp
65170a2341 Added export symbols for workaround of bugs #8317,#9637 in PHP5 2005-05-08 10:24:04 +02:00
georg@lmy002.wdf.sap.corp
626fcc4390 added symbols mysql_server_init and mysql_server_end to allow windows 
applications with embedded server to connect to external servers too.
(required for Connector/OO.org)
 2005-03-23 10:18:43 +01:00
mwagner@here.mwagner.org
292ca0959c libmysqld.def, libmysql.def: 
Use the invisible tabs (!)
 2005-01-12 21:04:31 -06:00
mwagner@here.mwagner.org
ffdeb4f880 libmysqld.def, libmysql.def: 
Add missing 'get_defaults_files' to fix linking error.
 2005-01-12 19:56:49 -06:00
bar@mysql.com
27fcb9f6af libmysql.def, libmysql.c: 
Minor clean-ups
 2004-11-05 08:44:40 +04:00
monty@mishka.local
04c23808a8 Review of all code pushed since last review 
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
 2004-10-20 01:28:42 +03:00
lenz@mysql.com
c2ca8e1a7a - fixed tabbing and added several missing symbols (required for 
linking with PHP5) (thanks to Georg Richter for the patch)
 2004-07-13 13:50:06 +02:00
konstantin@mysql.com
dabc0e774e mysql_stmt_field_count() 2004-06-06 02:27:05 +04:00
dlenev@brandersnatch.localdomain
03b705ff44 Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should 
produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
 2004-05-27 17:54:40 +04:00
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
hf@deer.(none)
78f58ff384 Fix to make Windows compilation smoother 2004-05-26 21:40:27 +05:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable 
Applied patches for Netware
 2004-05-26 19:12:49 +03:00
konstantin@mysql.com
392481dae5 Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set 
requested by Monty for Bug#1647 (No way to determine what size 
blob/clob is being returned into bound buffer)
 2004-04-30 01:02:29 +04:00
konstantin@mysql.com
889790a15c Simplification: MYSQL_RES *result replaced with MYSQL_DATA result; 
No need to check for result existence any more, store_result functions
now are shorter.
cli_read_binary_rows rewritten to handle MYSQL_DATA directly.
 2004-03-28 17:22:04 +04:00
miguel@hegel.local
7efba206fd For to export the renamed functions 2004-03-12 15:51:18 -03:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
miguel@hegel.local
108a7eabb6 For to export the right functions with changes done from 4.0.16 2004-02-04 13:39:01 -04:00
monty@mashka.mysql.fi
cab1dc628c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
 2003-11-18 13:47:27 +02:00
monty@mashka.mysql.fi
9ef2a83fbe Portability fixes for windows 
After merge fixes
 2003-10-15 22:40:36 +03:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
monty@narttu.mysql.fi
f05a1c8394 Block SIGPIPE also for not threaded client programs. 
Added --include and --libs_r options to mysql_config.
Added mysql_get_client_version() to client library
Fixed some minor benchmark issues
 2003-09-23 13:36:01 +03:00
venu@myvenu.com
bb718b31d0 implementation of mysql_stmt_reset client end 2003-07-08 02:27:21 -07:00
monty@narttu.mysql.fi
1bd306ccd4 Fixed some new memory leaks 
Updated VC++ files
 2003-06-24 12:10:35 +03:00
venu@myvenu.com
c14de0f584 1. Portability fixups for Connector/ODBC 3.52 & DBD 
(Addition of mysql_fetch_column & mysql_stmt_free_result)
 2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb
 2003-06-04 00:17:48 -07:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
venu@myvenu.com
08e10a976a Added mysql_fetch_column function 
Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
Fix for offset based re-fetch using mysql_fetch_column
Misc cleanups for ODBC compatibility
 2003-05-20 23:41:15 -07:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
miguel@hegel.local
63f911733b Exported functions required by MySQLCC 2003-04-16 11:43:04 -04:00
miguel@hegel.local
ca1f67c04e Exported functions claimed by MySQLCC 2003-04-11 14:48:03 -04:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows) 
Some changes to the prepared statement protocol to make it easier to use and faster.
 2003-01-21 21:07:59 +02:00
monty@mashka.mysql.fi
76f146a175 Merge with 4.0.9 2003-01-18 03:13:37 +02:00
miguel@light.
0928c8b4b4 Added functions required by MySQLCC 2003-01-11 01:56:00 -02:00
venu@myvenu.com
b74c43f475 protocol fixups 2002-11-22 10:04:42 -08:00