Commit graph

1345 commits

Author SHA1 Message Date
serg@serg.mylan
6023b58b9f Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflow 2004-08-11 23:43:41 +02:00
konstantin@mysql.com
403b91798a Cleanup in mysql_time.h/my_time.h headers. The first is used in mysql.h,
the second is for the rest of time declarations in mysys.
2004-08-05 14:16:43 -07:00
guilhem@mysql.com
2b6151c20f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-07-29 23:28:28 +02:00
guilhem@mysql.com
0f3e279a05 WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).
2004-07-29 23:25:58 +02:00
ingo@mysql.com
e25126c68a Casted all macro arguments,
used a common style with array subscripts,
improved the line-up, wrapped long lines.
2004-07-28 21:46:22 +02:00
hf@deer.(none)
94bfeb8393 Fixes for bugs in embedded library:
#4700 (Unsigned value returned as signed)
    just no appropriate checking
#4701 (Errors returned earlier than expected)
    all errors returned from send_command()
#4702 (Result isn't freed properly if there's no retrieval)
    flush_use_result has only 'client' version and should
    be made 'virtual'
2004-07-22 20:54:25 +05:00
hf@deer.(none)
5bff13bc72 Merging 2004-07-21 19:10:37 +05:00
serg@serg.mylan
141d43ef95 forced X/Open mode on HPUX removed. The correct way (that affects not only C but also C++ and linking) would be
CFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
CXXFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
LDFLAGS="-lxnet"

but apparently MySQL works without too.
2004-07-13 09:37:16 +02:00
monty@mysql.com
07808113d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-07-09 10:55:47 +03:00
monty@mysql.com
064b8b8f65 Merge with 4.0 to get bug fixes 2004-07-09 02:29:28 +03:00
konstantin@mysql.com
664329b565 my_global.h:
Define cxa_pure_virtual to print error message and DBUG_ASSERT:
  calls to pure virtual methods should not go unnoticed.
2004-07-09 01:35:35 +04:00
jani@a80-186-24-72.elisa-laajakaista.fi
97920edb9d Fixed Bug#4451. According to C/C++ standards, enums should not be used
out of their range.
2004-07-08 17:12:42 +03:00
bar@mysql.com
6fdafa5635 Don't allow badly formed UTF8 identitiers 2004-07-07 16:39:43 +05:00
serg@serg.mylan
df1f83db55 HAVE_RTREE_KEYS are enabled on windows too 2004-07-06 14:24:44 +02:00
serg@serg.mylan
c2295f163f Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 14:05:41 +02:00
serg@serg.mylan
9602e4a1a6 re-enable spatial features for windows
grr
2004-07-06 13:56:50 +02:00
paul@kite-hub.kitebird.com
c53dc62ece client.c, libmysql.c:
Symbol spelling change.
errmsg.c:
  Client error message edits.
errmsg.h:
  Two symbol spelling changes.
2004-06-30 22:18:41 -05:00
hf@deer.(none)
eb67909bf4 WL#1600 (Warn if result is truncatet due to max_allowed_packet) 2004-06-29 19:55:13 +05:00
monty@mysql.com
eca9418ca7 Added missing my_time.c file to mysqlclient project
Moved include <assert.h> to my_global.h
2004-06-28 00:42:02 +03:00
serg@serg.mylan
b8369481fe correct casting void->char 2004-06-27 17:16:05 +02:00
konstantin@mysql.com
786e5ff717 Fix for compilation failure on high-byte-first platforms. 2004-06-26 04:54:11 +04:00
monty@mysql.com
e7a01ed3dc After merge fixes 2004-06-25 21:56:23 +03:00
monty@mysql.com
b1d08ba2b4 Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
konstantin@mysql.com
354e2ba67b Type of MYSQL_BIND::buffer changed to void * 2004-06-25 17:04:33 +04:00
dlenev@brandersnatch.localdomain
1013d3c7ec Small build fix.
Add my_time.h to list of headers which should be put ot include/ during make dist.
2004-06-25 10:30:24 +04:00
konstantin@mysql.com
29b88ff539 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-24 19:09:31 +04:00
konstantin@mysql.com
a30fcdc690 Fix for Bug#4030 "Client side conversion string -> date type doesn't
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
  MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
2004-06-24 19:08:36 +04:00
monty@mysql.com
ad86016e2f lower_case_table_names=2 (Keep case for table names) was not honored
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)
2004-06-23 16:44:34 +03:00
serg@serg.mylan
c03addab79 merged 2004-06-23 12:36:07 +02:00
serg@serg.mylan
3f1c4ba745 handler interface cleanups:
more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
2004-06-23 12:29:05 +02:00
guilhem@mysql.com
c846e86d54 Including in enum_shutdown_level the 2 types of KILL of 5.0
(enum_shutdown_level is going to replace enum killed_state in 5.0).
2004-06-21 23:04:50 +02:00
guilhem@mysql.com
ff678fd8b7 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-21 16:37:33 +02:00
guilhem@mysql.com
99bc72d9ed changing order of enum_shutdown_level (easier; we can test if we should die with
"if (thd->killed > thd->killable)", if we simply do
thd->killed= level;
2004-06-21 16:36:28 +02:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
guilhem@mysql.com
6b45c24d39 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-18 23:51:15 +02:00
guilhem@mysql.com
19dbf58eec API change: mysql_shutdown() now requires a 2nd argument, the shutdown level.
mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
(it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
So this change is just to make the 4.1 API suitable before it is frozen. Later
we will actually implement the shutdown levels.
2004-06-18 23:50:04 +02:00
dlenev@brandersnatch.localdomain
09ba29e539 WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
  
WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
function".
  
Fixed problems described in Bug #2336 (Different number of warnings 
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated 
at Field object level not in conversion functions).
  
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
2004-06-18 10:11:31 +04:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
gluh@gluh.mysql.r18.ru
5ae1d2843b Fixed issue 'the definition of macro DES_ede3_cbc_encrypt is corrupt' 2004-06-17 15:01:54 +04:00
konstantin@mysql.com
e9f2c7d478 Comments and cleanups in client library. 2004-06-16 23:11:02 +04:00
lenz@mysql.com
14ace68c98 - make sure to define NDEBUG in my_dbug.h, when DBUG_OFF is defined
(to disable assertions)
2004-06-15 14:37:45 +02:00
guilhem@mysql.com
25de721934 Adding SHUTDOWN_WAIT_STATEMENTS to the possible arguments of mysql_shutdown().
Comments on names still welcome.
2004-06-15 14:28:00 +02:00
guilhem@mysql.com
f1fda6387e API change: mysql_shutdown() now needs a 2nd parameter, the shutdown level.
Server will however still accept shutdown without specified level; so that old
mysqladmin can still shut server down.
I would like your comments on the names of shutdown level which I chose. You
are welcome to propose better names. Please however check WL#709 before.
Reason for the names I propose is to be accurate, thus leaving possibility
for other levels which we may imagine in the future; that's why I have rejected
names like "fast", "smart", "graceful" so far. My position is that WAIT_ALL_BUFFERS
or WAIT_CRITICAL_BUFFERS say what the shutdown does, whereas for "smart", "fast" you
need to remember what it does.
This should be pushed in 4.1.3 but only after your comments.
2004-06-15 11:35:23 +02:00
paul@teton.kitebird.com
2f76413e5a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/bk/mysql-4.1
2004-06-12 14:38:45 -05:00
paul@teton.kitebird.com
a26af7d84e sql_state.h:
Fix couple of typos.
2004-06-12 14:37:41 -05:00
bar@mysql.com
cbd3e61c8d Unicode collation algorithm: contraction support.
E.g. 'Ch' is treated as a separate letter in Czech,
not as a combination of C+h.
2004-06-12 20:36:58 +05:00
serg@serg.mylan
035e03c1f6 merged 2004-06-11 20:55:08 +02:00
bar@mysql.com
c64d93b274 Allocate memory when a character set is requested:
- For simple character sets: from_uni convertion table.
- For UCA: alternative weight arrays.
Use mbminlen instead of MY_CS_NONTEXT
2004-06-11 16:29:16 +05:00
konstantin@mysql.com
f08bbd1f12 assert.h needed for my_dbug.h now is included in my_dbug.h, where it for
some reason wasn't included before.
A lot of files cleaned up from #include <assert.h>
2004-06-10 23:58:39 +04:00
serg@serg.mylan
78fa465b92 bug#3964 and related issues: FTB problems with charsets where one byte can match many
correct prefix compare with my_strnncoll
2004-06-10 21:18:57 +02:00
bar@mysql.com
34d413a6a0 Optimization to use less memory. 2004-06-10 19:10:21 +05:00
gluh@gluh.mysql.r18.ru
d9d0fe7a1a Fixed issue with compilation MySQL with OpenSSL
if OpenSSL is installed in non-statndart directory
('openssl/opensslv.h: No such file or directory')
2004-06-09 20:02:08 +04:00
bar@bar.intranet.mysql.r18.ru
8962ed3c7d WL#916: Unicode collations for some languages 2004-06-08 17:56:15 +05:00
konstantin@mysql.com
dabc0e774e mysql_stmt_field_count() 2004-06-06 02:27:05 +04:00
konstantin@mysql.com
7d09dd999a HAVE_DEPRECATED_411_API macro removed. 2004-06-04 18:38:18 +04:00
hf@deer.(none)
b8cf9f6afe Merging 2004-06-02 19:17:35 +05:00
hf@deer.(none)
7cf1d2596b wl 1562 (To improve RTree indexes)
some changes to make code nicer
2004-06-02 19:11:57 +05:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
hf@deer.(none)
39f69a2126 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr
2004-06-01 22:37:39 +05:00
hf@deer.(none)
ce55ee9cd9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2004-05-31 13:53:44 +05:00
hf@deer.(none)
9145dcef5e mysql_get_parameter interface fixed 2004-05-31 13:53:10 +05:00
serg@serg.mylan
5bd03da8b2 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-05-29 17:53:01 +02:00
serg@serg.mylan
2e1ded2fe1 backport wild_compare fix from 4.1 - bug#3924 2004-05-29 17:52:20 +02:00
monty@mysql.com
4b6a057cae Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-28 11:03:20 +03:00
monty@mysql.com
cb5c3f6e2e Added option --config-extra-env to Do-compile 2004-05-28 11:02:34 +03:00
heikki@hundin.mysql.fi
e734cde6a6 my_global.h:
Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater
2004-05-28 09:06:19 +03:00
monty@mysql.com
ccc4171276 Portability fix (using 'char' as argument to C functions may give warnings) 2004-05-28 02:36:43 +03:00
monty@mysql.com
be7f1a3570 merge with 4.0 to get fix for hpux 2004-05-28 02:04:07 +03:00
monty@mysql.com
47cc3af0e9 Always enable HAVE_COMPRESS on netware 2004-05-28 01:02:20 +03: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
hf@deer.(none)
3a5e8d58cc Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr
2004-05-27 17:37:47 +05: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
98741a50df Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-26 19:13:12 +03:00
magnus@neptunus.(none)
595cd3f5f1 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-26 14:29:53 +02:00
monty@mysql.com
7c10c0ac00 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-26 00:02:06 +03:00
monty@mysql.com
92c15122da Added new header files 2004-05-26 00:01:23 +03:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
monty@mysql.com
2397f7081a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:38:43 +03:00
hf@deer.(none)
640728a051 Proposed fix for bug #3818 (libmysqld.dll leads to program's crash)
configurations added to build the libraries with USE_TLS flag to be
used for libmysqld
2004-05-26 00:27:00 +05:00
monty@mysql.com
ca8dbc24ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
bar@bar.intranet.mysql.r18.ru
391d5629f6 Preparation for user-defined Unicode collations:
weights data now comes from a static variables
but from the charset structure.
2004-05-25 17:40:20 +05:00
magnus@neptunus.(none)
2bee88a4c2 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-25 12:25:22 +02:00
monty@mysql.com
af44187bff Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
monty@mysql.com
0babddff40 New MYSQL_SERVER_SUFFIX usage (for easier compilation)
Update of VC++ project files.
2004-05-25 02:28:44 +03:00
konstantin@mysql.com
f207b33a7b Support for character set conversion in binary protocol: another go
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
  connection on the fly, because they first should be written to the binary
  log.
  To support efficient conversion we need to rewrite prepared statements
  binlogging code first.
2004-05-25 02:03:49 +04:00
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
monty@mysql.com
86a966256b Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
2004-05-19 16:38:12 +03:00
magnus@neptunus.(none)
1f1b01e028 Merge 2004-05-17 09:57:02 +02:00
monty@mishka.local
314a8bf114 key_cmp -> key_cmp_if_same
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys
2004-05-16 14:48:32 +03:00
magnus@neptunus.(none)
581819624f Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-13 13:28:56 +02:00
magnus@neptunus.(none)
97bf111f1d WL #1729 Handler: error text for NDB errors
- New solution after discussions with Sergei, no handler specific code or error messages should be in sql layer.
next_result, only check for error if check is -1
Improved index_read
2004-05-13 11:56:45 +02:00
monty@mysql.com
116f61c656 Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.
Prefer not automatic keys before automatic keys. If there is two conf
2004-05-12 00:29:52 +03:00
magnus@neptunus.(none)
02c9f8cfe0 WL# 1729 Handler: error text for NDB errors
- Close an open scan if index_read is called without closing the previous one.
- Removed some errors that occured during previous merge
2004-05-11 13:59:22 +02:00
monty@mysql.com
4ef7918e18 Add read_rnd_buffer_size in my.cnf example files
Remove wrong redefine of vio_reset() (to compile libmysqld on windows)
2004-05-10 17:37:38 +03:00
georg@beethoven.local
c745ae9503 Added additional parameter userdata for mysql_set_local_infile_handler
to allow binding of userland functions in PHP.
2004-05-07 14:50:10 +02:00
ingo@mysql.com
5c4f83bbd9 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
2004-05-07 11:13:58 +02:00
monty@mysql.com
939ea71ecd Portability fixes
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
2004-05-07 01:43:17 +03:00
ingo@mysql.com
784c9526ec WL#1687 - Optimize UNION DISTINCT ... UNION ALL (again).
HEAP: Copies the key count to a backup variable and sets the key count to zero.
That way, no HEAP function will ever try to touch any index.
Re-enabling is done by copying back the backup variable.
To avoid memory leak at table close, disable deletes all index trees.
Re-enabling must be done with empty indexes and data anyway. Otherwise,
the indexes would need to be repaired, wich HEAP is not capable of.
MyISAM: Only the key_map is cleared and set.
Re-enabling must be done with empty indexes and data. Otherwise, repair needs
to be done which will enable all keys persistently.
The former implementation disabled only non-unique keys and maked this persistent.
The new implementation additionally can disable all keys, but only without
making this persistent. Re-enabling all keys can be done without repair,
if data file and indexes are empty.
2004-05-06 15:53:01 +02:00