1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Commit Graph

14219 Commits

Author SHA1 Message Date
paul@ice.snake.net
3ee1d0201c Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-13 22:43:26 -05: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
brian@avenger.(none)
2fb2ee6f8f Adding test cases for the example storage engine (so that you can test to see if it was built correctly). 2004-08-13 17:14:36 -07:00
brian@avenger.(none)
b7b48d6764 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/tina-4.1
2004-08-13 16:27:17 -07:00
brian@avenger.(none)
1bb0c2ac93 Merge resolve. Changed name of ha_example to ha_example_engine. 2004-08-13 16:24:46 -07:00
paul@ice.snake.net
22550c301b set_var.cc:
Make query_cache_wlock_invalidate show up in SHOW VARIABLES.
  (Sanja agrees that it should show up, has seen the patch, and
  agrees that it's correct.)
2004-08-13 14:31:30 -05:00
paul@ice.snake.net
496497490a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-13 12:40:51 -05:00
serg@serg.mylan
68f193f97d Merge 2004-08-13 18:31:30 +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
joreland@mysql.com
39d07e4e6b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-13 17:11:52 +02:00
joreland@mysql.com
8b7bd89bef Fix apiConnectptr after execute direct 2004-08-13 17:10:08 +02:00
joreland@mysql.com
f75dcd9409 Dump core if VM_TRACE || ERROR_INSERT 2004-08-13 16:41:06 +02:00
joreland@mysql.com
40430a3fea Fix type for 4115 2004-08-13 16:37:19 +02:00
joreland@mysql.com
4e5db0cdba Bug fix for error insert 5038,
timeout in abort handling with more than 128 operations
2004-08-13 16:33:55 +02:00
heikki@hundin.mysql.fi
5273b4e5f5 row0mysql.c:
Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table
2004-08-13 17:27:58 +03:00
lenz@mysql.com
586e5af9e7 - manual merge 2004-08-13 16:25:23 +02:00
paul@ice.snake.net
d471c96867 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-13 09:25:22 -05:00
joreland@mysql.com
df3c69f444 New error codes + automatic nulling of tvariables 2004-08-13 16:11:00 +02:00
bar@mysql.com
1c8b328e16 CSC issue # 3299 fix:
ENUM and SET type didn't compute their length correctly.
That showed up for example while converting into a CHAR column.
2004-08-13 19:06:24 +05:00
guilhem@mysql.com
c9a46a43d2 Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT:
this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to
10.3.5) and is expected to fix 
BUG#2030 "relay bin log on slave resets multiple times a second"
(i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT).
So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals.
Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once,
where using SSL seems to make the problem more frequent...
2004-08-13 15:29:47 +02:00
mskold@mysql.com
40577d587d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-13 14:34:51 +02:00
mskold@mysql.com
7480f2dae4 Removed unused error code 2004-08-13 14:33:59 +02:00
mskold@mysql.com
7c6b884ef5 Added support for NULL in unique index 2004-08-13 13:51:18 +02:00
paul@ice.snake.net
50f77014b9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-13 06:28:09 -05:00
lenz@mysql.com
7fac8214b6 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-08-13 12:44:08 +02:00
bar@mysql.com
8186470b6b ctype_utf8.result, ctype_utf8.test, item_strfunc.cc:
LEFT() didn't work well in some cases.
2004-08-13 15:04:10 +05:00
joreland@mysql.com
73e15672f4 Introduced system for automatic clearing of block global variables (VM_TRACE'd) 2004-08-13 09:53:21 +02:00
bar@mysql.com
eb5f9437f1 ctype_utf8.result, ctype_utf8.test, mi_key.c:
bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
2004-08-13 12:32:27 +05:00
bell@sanja.is.com.ua
0ce931947e skip resolving field in table list if table list is not accessable due to groupping (BUG#4814) 2004-08-13 10:01:30 +03:00
bar@mysql.com
186e6cb2d6 ctype_ucs.result, ctype_ucs.test, item.cc:
#5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
2004-08-13 11:13:56 +05:00
brian@avenger.(none)
1fe8b35bba This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file. 2004-08-12 20:57:18 -07:00
vva@eagle.mysql.r18.ru
698a88b15d Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
2004-08-13 02:27:21 +05:00
vva@eagle.mysql.r18.ru
3681594d08 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
2004-08-13 02:25:50 +05:00
vva@eagle.mysql.r18.ru
b1c63b909b Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
2004-08-13 01:25:35 +05:00
vva@eagle.mysql.r18.ru
17af0b8f57 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
2004-08-13 01:21:22 +05:00
lenz@mysql.com
b1f5aa0094 - portability fix for SCO Open Server 5.0.7 (thanks to Boyd Gerber) 2004-08-12 21:55:05 +02:00
lenz@mysql.com
c484f82b21 - Fixed two small version number issues in MySQL-shared-compat.spec 2004-08-12 21:40:34 +02:00
lenz@mysql.com
c8f8ca889f - giving a range does not work for platform detection in configure.in
- resorting to having to separate sections for darwin7 and darwin8
2004-08-12 21:15:49 +02:00
joreland@mysql.com
3fdc2999b7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-12 20:31:00 +02:00
bar@mysql.com
eb1a82b25d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-12 20:43:14 +05: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
bell@sanja.is.com.ua
d372284d09 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-08-12 18:38:29 +03:00
vva@eagle.mysql.r18.ru
5406709672 fixed Bug #4358 Problem with HAVING clause that uses alias
from the select list and TEXT field 

make setup_copy_fields to insert Item_copy_string for blobs in 
the beginning of the copy_funcs (push_back instead of push_front)

the thing is that Item_copy_string::copy for function can call 
Item_copy_string::val_int for blob via Item_ref.
But if Item_copy_string::copy for blob isn't called before, 
it's value will be wrong.

So all the Item_copy_string::copy for blobs should be called before 
Item_copy_string::copy for functions.
2004-08-12 20:37:31 +05:00
bell@sanja.is.com.ua
d7ae5de89b in case of compound index fill all parts in optimized IN (BUG#4435) 2004-08-12 17:31:23 +03:00
paul@ice.snake.net
54adeb0976 mysqld.cc:
Help message edit.
2004-08-12 08:47:45 -05:00
marko@hundin.mysql.fi
96b58258f3 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-08-12 15:34:29 +03:00
lenz@mysql.com
98298c77bc Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-08-12 13:52:43 +02:00
ram@gw.mysql.r18.ru
0f0b1ebe62 Added initial sorting in order to make test case repeatable. 2004-08-12 16:16:38 +05:00
guilhem@mysql.com
5332e74a4f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-12 13:13:22 +02:00
guilhem@mysql.com
6345dc4fbd Fix for BUG#4678 "mysql-test-run fails on grant_cache":
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
(such behaviour is a feature of mysql_real_connect(), see the manual).
2004-08-12 13:12:09 +02:00