Commit graph

778 commits

Author SHA1 Message Date
monty@mysql.com
1dd4bd5f6c Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-07 12:51:32 +03:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
monty@mysql.com
97febc4dc4 Code cleanups while doing review of pushed code 2004-10-06 17:20:39 +03:00
monty@mysql.com
c27d22b44e Reverted patch for new usage of open_count as it caused more problems than it solved
Cleaned up patch for checking locks for multi-table updates
2004-10-06 01:24:21 +03:00
sergefp@mysql.com
df267c6c0a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/mnt/tmp/mysql-4.0-bug-myisampack
2004-09-22 16:42:06 +04:00
sergefp@mysql.com
6e0ba8e615 Fix for BUG#4785:
* myisampack leaves key_file_length value from original table
 * myisamchk uses this value when calculating key file pointer length
2004-09-22 16:29:15 +04:00
ingo@mysql.com
7afb03b7ed bug#2831 - --extenral-locking does not fully work with --myisam-recover.
Changed the semantics of open_count so that it is decremented
at every unlock (if it was incremented due to data changes).
So it indicates a crash, if it is non-zero after a lock.
The table will then be repaired.
2004-09-18 20:33:39 +02:00
hf@deer.(none)
02595629c2 Fix for bug #5532 (error 22 inserting GIS data)
This bug is the result of weird error happening with mi_float8get and double
arythmetic. I described that in 'Bug that looks potentially dangerous' email
2004-09-15 19:46:42 +05:00
serg@serg.mylan
9153fd2ae4 merged 2004-09-03 22:12:27 +02:00
serg@serg.mylan
9b0468bc96 BUG#5327 - mi_sort_index() of 2-level tree 2004-09-03 22:04:08 +02:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
ram@gw.mysql.r18.ru
b93a973b12 Added global my_getopt_error_reporter function pointer which is
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
2004-08-31 21:27:58 +05:00
serg@serg.mylan
994d648dda space-stripping in _mi_prefix_search: BUG#5284 2004-08-30 16:12:53 +02:00
serg@serg.mylan
b60713c033 bug in my_strnncoll_utf8 (and friends) fixed
cleanups
better, charset-dependent, ft_max_len_for_sort value
2004-08-30 08:37:36 +02:00
serg@serg.mylan
acbf96a161 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:49:16 +02:00
monty@mysql.com
ea687ba5da Portability fixes
Fixed bug in end space handle for WHERE text_column="constant"
2004-08-26 18:26:38 +03:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
serg@serg.mylan
50ee43be43 BDB: Bug#4531: unique key prefix interacts poorly with utf8,
Bug#4594 column index make = failed for gbk
2004-08-24 15:32:57 +02:00
serg@serg.mylan
949348f576 after merge fix 2004-08-20 22:54:42 +02:00
bar@mysql.com
7a27f2ce8c Bug#4594 "column index make = failed for gbk, but like works"
Fix for MyISAM. Tests for MyISAM and HASH+BTREE.
2004-08-20 21:29:36 +05:00
bar@mysql.com
2496e85b84 Bug#4521: unique key prefix interacts poorly with utf8.
Fix for binary collations for MyISAM and HEAP BTREE.
This patch also changes trailing spaces behaviour for
binary collations. Binary collations now have PAD 
characteristic too.
2004-08-19 15:15:10 +05:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
rburnett@build.mysql.com
67003d1c98 mysql_priv.h:
Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
2004-08-14 03:38:37 +02:00
serg@serg.mylan
cd7276689e apply UNIQUE constrain correctly for multi-byte charsets
only MyISAM is fixed
2004-08-13 18:29:25 +02:00
bar@mysql.com
fad7a5643a #4521: unique key prefix interacts poorly with utf8
Fix for MyISAM with prefix compressed keys.
2004-08-12 20:39:24 +05:00
serg@serg.mylan
56b423e058 bad merge fixed - myisamchk support for --ft_stopword_file restored 2004-08-10 10:07:59 +02:00
serg@serg.mylan
f4244cd00e bug#4816. index search for NULL in blob 2004-08-01 13:26:01 +02:00
ingo@mysql.com
4b42225c55 Fixed some DBUG_PRINT format problems. 2004-07-26 15:32:52 +02:00
ingo@mysql.com
d2c8d8d609 Fixed a probable typo. Unfortunately we will not be able to test this ;-) 2004-07-26 13:58:08 +02:00
konstantin@mysql.com
569d3c8488 WL#1518, "make bundled zlib usable for unix builds":
required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb 
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts 
like AIX52 or HPUX11, where such a check is possible. It didn't compile 
there before as these systems dont't have installed zlib, so nothing got broken ;)
2004-07-24 03:30:11 -07:00
serg@serg.mylan
2b93adb9c1 Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci) 2004-06-25 13:11:02 +02: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
monty@mysql.com
1388c164bc After merge fixes
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
2004-06-21 10:21:20 +03:00
monty@mysql.com
fd0153304d Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173)
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code
2004-06-18 03:02:29 +03:00
serg@serg.mylan
516bcf508c after merge fix 2004-06-11 21:20:53 +02:00
serg@serg.mylan
035e03c1f6 merged 2004-06-11 20:55:08 +02: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
konstantin@mysql.com
e64b38e8bc Fix for Bug#3904 "COUNT DISTINCT performance anomaly in 4.1"
The bug was caused by error in hash calculation function: it
always returned hash value for last field in a composite key, so 
for keys like (a text, b char(1)) we were always
getting bad hash values.
2004-06-10 01:30:39 +04:00
serg@serg.mylan
a3e684da44 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-04 21:16:55 +02:00
serg@serg.mylan
9a9bde89ce make CHECK killable 2004-06-04 21:15:08 +02:00
paul@kite-hub.kitebird.com
2f0ca1ce42 Fix skipp -> skip once and for all.
(Note: This affects only comments, not variable names.)
2004-06-03 11:52:54 -05:00
monty@mysql.com
5ddf741a8d portability fix 2004-06-03 02:13:19 +03: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
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
monty@mysql.com
b32fd18630 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-28 00:06:19 +03:00
monty@mysql.com
e9b7e3baa8 merge with 4.0 to get fix to VC++ project files 2004-05-27 23:45:22 +03:00
serg@serg.mylan
1998dd786e backport bug#2708 fix from 4.1 2004-05-27 21:14:59 +02:00