monty@narttu.mysql.fi
dc6f07256c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-10-08 18:55:34 +03:00
lenz@kallisto.local
ce9c9845a1
- portability fix: replaced "uint" with "unsigned int"
2003-10-08 13:26:29 +02:00
monty@narttu.mysql.fi
359d40f2f5
merge
2003-10-07 21:41:07 +03:00
heikki@hundin.mysql.fi
6112853cda
Many files:
...
Multiple tablespaces for InnoDB
sql_table.cc:
Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
2003-10-07 17:28:59 +03:00
monty@narttu.mysql.fi
6056cfadfc
Merge with 4.0.16
2003-10-07 15:42:26 +03:00
monty@mishka.mysql.fi
53fa223ed6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-06 22:57:04 +03:00
monty@mishka.mysql.fi
a5c83b05bd
Move init_compiled_charsets to own file
...
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup
2003-10-06 22:56:34 +03:00
bell@laptop.sanja.is.com.ua
e527f268d5
fixed error names
2003-10-06 22:35:05 +03:00
hf@deer.(none)
8bc13b1874
Fix for bugs #1437 , #1446
2003-10-04 19:28:08 +05:00
hf@deer.(none)
cca80f8b58
SCRUM
...
embedded library
some fixes - cleanup procedure changed for embedded library - deletion of
embedded mysql->thd
2003-09-29 14:09:51 +05:00
hf@deer.(none)
5f8e7fef27
Merge
2003-09-26 15:40:26 +05:00
hf@deer.(none)
ba8fa76fa2
SCRUM:
...
WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server
2003-09-26 15:33:13 +05:00
bar@bar.mysql.r18.ru
9b4b9f91de
CHARSET_INFO::instr was extended to return more substring match results:
...
- offset of substr begining
- offset of substr end
- number of characters (MB compatible)
2003-09-25 13:35:21 +05:00
ram@gw.mysql.r18.ru
df59678b95
A fix. Please never use 'ulong' here!
2003-09-24 15:41:09 +05:00
monty@narttu.mysql.fi
5f164e2f70
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-09-23 13:36:25 +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
lenz@mysql.com
f9dd5ad0e9
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2003-09-23 00:38:26 +02:00
lenz@kallisto.local
f01a6f7eae
- Polished mysql-copyright a bit and added call to remove
...
cmd-line-utils/readline from the commercial distribution
- fixed some copyright headers so mysql-copyright can process them
2003-09-23 00:38:01 +02:00
bar@bar.mysql.r18.ru
99e2a82168
Bug 1350 fix
2003-09-22 11:11:36 +05:00
bar@bar.mysql.r18.ru
1c5b5ee0ec
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-19 15:19:15 +05:00
bar@bar.mysql.r18.ru
e0a0790ebb
Fixed that multibyte charsets didn't honor multibyte
...
sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.
2003-09-19 15:18:19 +05:00
hf@deer.(none)
a2dbfaefa3
SCRUM
...
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
2003-09-19 14:44:31 +05:00
hf@deer.(none)
cda32e123c
SCRUM
...
prepared statements in embedded library.
some fixes after testing
2003-09-19 14:05:28 +05:00
hf@deer.(none)
e89e3ff753
SCRUM
...
embedded library
some dirty places cleaned:
uint removed from mysql.h as Miguel suggested
empty_string renamed as my_empty_string to get rid of name's intersections
using embedded library
2003-09-18 18:58:02 +05:00
hf@deer.(none)
0e059dcb74
SCRUM:
...
embedded library
I decided to get rid of #define mysql_some_function in mysql.h
It puzzles users and makes problems with dynamic libraries
Finally, there are only two functions left, that are covered with
the #define-s and it won't hurt performance at all
2003-09-18 18:28:42 +05:00
hf@deer.(none)
7dd4cb58d6
SCRUM
...
prepared statements in embedded library
2003-09-18 12:25:00 +05:00
hf@deer.(none)
ccc28f46de
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-17 20:58:31 +05:00
hf@deer.(none)
ddbca4176d
SCRUM:
...
prepared statements in embedded library
2003-09-17 20:48:53 +05:00
bar@bar.mysql.r18.ru
731b8392ee
Charset number is now stored into error.sys by comp_err and loaded by mysqld.
2003-09-17 16:22:58 +05:00
hf@deer.(none)
117d18335a
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-17 15:18:48 +05:00
hf@deer.(none)
7a763f3fe3
SCRUM
...
prepared statements in embedded library
2003-09-17 15:18:18 +05:00
greg@mysql.com
7facccf322
BUG #1305 : ISAM table handler should not be compiled by default under 4.1
2003-09-17 00:30:29 -04:00
hf@deer.(none)
efd2e122ef
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-16 16:36:13 +05:00
hf@deer.(none)
6dd77126b4
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-16 16:07:00 +05:00
hf@deer.(none)
bf017a2eb0
SCRUM
...
Prepared statements in embedded server
Several changes in library code with two goals:
to make mysql_prepare_stmt working in embedded server
to get rid of #define mysql_interface_func mysql->methods->interface_func
in user's interface
2003-09-16 16:06:25 +05:00
bar@bar.mysql.r18.ru
83c6946232
Bug fix:
...
http://bugs.mysql.com/bug.php?id=1264
2003-09-16 15:43:17 +05:00
dlenev@mysql.com
2c24b2e9b4
Manual merge after commiting START SLAVE UNTIL
2003-09-14 01:57:09 +04:00
dlenev@dlenev.mshome
c0cfae1c8d
Implemented support for START SLAVE UNTIL (WL#868)
2003-09-14 00:13:41 +04:00
dlenev@mysql.com
1c11077d60
Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with
...
their newer DES_ versions.
Provided macros for backward compatibility.
2003-09-12 22:33:43 +04:00
hf@deer.(none)
e63e2229b6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-12 19:36:42 +05:00
hf@deer.(none)
9f3996cde9
SCRUM:
...
#977 Prepared statements in embedded library
2003-09-12 19:35:34 +05:00
monty@mashka.mysql.fi
7538242e4f
merge with 4.1 tree
2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
73f66f68fd
merge with 4.0.15
2003-09-11 20:24:14 +03:00
monty@mashka.mysql.fi
45aa92c574
After merge fixes.
...
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
hf@deer.(none)
f434b329f5
SCRUM
...
embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'
2003-09-11 09:46:31 +05:00
monty@mashka.mysql.fi
223a966763
Remove not used define (my_strxfrm)
2003-09-11 06:09:34 +03:00
bell@sanja.is.com.ua
ad07ffbf6d
merge
2003-09-09 22:26:19 +03:00
monty@mashka.mysql.fi
99490870e6
Cleaned up last bug fixes
...
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
2003-09-09 20:06:50 +03:00
hf@deer.(none)
2ba517a3f1
fix for #1210
2003-09-08 13:11:18 +05:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03:00