mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32578 commits 2784 branches 343 tags 1.6 GiB
Commit graph

447 commits

Author SHA1 Message Date
igor@rurik.mysql.com
c963b12fd3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-07 06:38:05 -07:00
elliot@mysql.com
b906f31388 BUG#7967 Fix mysqlhotcopy --record-log-position 2005-06-06 22:17:16 -04:00
konstantin@mysql.com
f96de23ad3 Remove automatically generated autotools files from revision control. 
Fix build scripts to create them.
 2005-05-18 15:23:29 +04:00
monty@mysql.com
780202f130 Moved some old test and added a new test to only be run with mysql-test-run --big 
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
 2005-04-07 19:24:14 +03:00
serg@serg.mylan
d6062ef9b5 removed a reference to non-existing file 2005-04-05 16:39:40 +02:00
georg@lmy002.wdf.sap.corp
a9fde23474 typecast fix for windows 64-bit compilation error 2005-03-16 08:51:57 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
Sinisa@sinisa.nasamreza.org
5da6cd551d Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-03-07 16:23:41 +02:00
Sinisa@sinisa.nasamreza.org
79ac22e324 A fix for a bug #8830, which occured when binary data from blob was 
dumped with --hex-blob and --skip-extended-insert options.
 2005-03-05 22:06:07 +02:00
Sinisa@sinisa.nasamreza.org
a54b5ea52f Fixing bug #8850 in such a way that when TRUNCATE is called within 
stored  procedure,  it  is converted  to DELETE.
 2005-03-05 21:44:15 +02:00
monty@mysql.com
ab11370de6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-28 12:00:18 +02:00
joreland@mysql.com
fe2a800423 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-25 11:48:46 +01:00
joreland@mysql.com
54af1b8fc8 add auto generated ndb dsp-files (for msvc++ 6.0) to ignore file 2005-02-25 11:47:27 +01:00
hf@deer.(none)
dca227bac6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-02-09 16:34:03 +04:00
hf@deer.(none)
2f7f2dfe5d Fix for NCHAR bug appeared during the merging 2005-02-09 16:32:43 +04:00
bell@sanja.is.com.ua
7df94d5e9b fixed C++ syntax in C code 
fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
ignore my_decimal.cc in libmysqld directory
 2005-02-09 11:35:22 +02:00
hf@deer.(none)
b94a482ee9 Precision Math implementation 2005-02-09 02:50:45 +04:00
monty@mysql.com
79ec81071a Better bugfix for "HAVING when refering to RAND()" (Bug #8216) 
Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func()
 2005-02-08 14:41:09 +02:00
tomas@poseidon.ndb.mysql.com
4637544c61 small testcase update 2005-02-07 11:17:24 +01:00
serg@serg.mylan
852f2e0aba small Makefile.am cleanup 
clean: targets removed
    generated *.h files moved to include/
 2005-01-28 17:14:03 +01:00
serg@serg.mylan
76f3d6f002 merged 2005-01-25 21:11:04 +01:00
monty@mysql.com
37168015cd Cleanups during review 2005-01-25 21:27:51 +02:00
jimw@mysql.com
d11081bd6f Merge 2005-01-24 13:48:48 -08:00
serg@serg.mylan
736530afc8 merged 2005-01-24 21:30:21 +01:00
lenz@mysql.com
9675b0698f - renamed client_test -> mysql_client_test 
- renamed the tests that use the embedded server (client_test -> 
  mysql_client_test_embedded, mysqltest -> mysql_test_embedded
  and changed some Makefiles and scripts so they are installed in $bindir
  (required to be able to run the test suite against the embedded server)
 2005-01-20 16:25:38 +01:00
monty@mysql.com
3b0f8cabaf Merge with global tree 2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
monty@mysql.com
97b28521e6 Added ndb_types.h to ignore 2005-01-15 12:36:20 +02:00
anjuta@arthur.local
224fcd4717 Merge 2005-01-13 19:14:10 +02:00
anjuta@arthur.local
f23cdbcd4a Bug in InnoDB; 
file closing in extra/comp_err.c
 2005-01-13 19:03:46 +02:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00
monty@mysql.com
cc8a333980 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-06 17:36:48 +02:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
monty@mysql.com
e5cd3c6090 added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignore 2005-01-03 22:00:32 +02:00
wax@kishkin.ru
dc6a186659 WL#964 
added sort of file names for all OS
 2005-01-03 18:37:08 +05:00
joerg@mysql.com
8311f83f06 Clean up the handling of "server" and "client" directories, while still avoiding the double listing of 
common directories in 'SUBDIRS' macro ("make distclean" had failed due to that).
Solves bug#7368: "regex make error in 4.1.8"
 2004-12-30 14:03:19 +01:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
wax@kishkin.ru
e81d48fdd9 corrected mysqltest.dsp 
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
 2004-12-14 18:46:55 +05:00
anjuta@arthur.local
a045161e5b Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; 2004-12-14 01:54:16 +02:00
anjuta@arthur.local
53db34f992 Added missing errmsg.txt 2004-12-13 23:28:24 +02:00
petr@mysql.com
fd94614f34 merge 2004-12-09 04:22:28 +03:00
Sinisa@sinisa.nasamreza.org
a90da35fe6 Fix for a bug #6996 2004-12-07 19:12:29 +02:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
hf@deer.(none)
71bfbbdcd0 Fixes to make mysql-test-run --embedded-server working 2004-12-02 16:08:17 +04:00
lenz@mysql.com
51e18c217a - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds 2004-11-22 17:08:06 +01:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
tomas@poseidon.ndb.mysql.com
b67491ee41 ignore fix 2004-11-19 09:38:41 +00:00
tomas@poseidon.ndb.mysql.com
73f098836f added to ignore list 2004-11-19 09:35:12 +00:00
timour@mysql.com
0a11036e1c Fixed one warning and two errors reported by VC 6.0. 2004-11-18 11:24:18 +02:00
serg@serg.mylan
60e3e821c6 don't delete ac_available_languages_fragment in configure - it may be needed later 2004-11-16 16:52:29 +01:00
serg@serg.mylan
87840e841c Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-15 19:27:06 +01:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
serg@serg.mylan
aafb2cf6a3 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-11 13:44:10 +01:00
monty@mysql.com
0ebc50b851 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2004-11-09 21:47:46 +02:00
monty@mysql.com
3d0f7eca4e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-09 21:45:36 +02:00
serg@sergbook.mylan
c79f4c08d6 Merge sergbook.mylan:/usr/home/serg/Abk/mysql-5.0 
into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0-xa
 2004-11-09 16:44:23 +01:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
serg@sergbook.mylan
342fb28efa decimal.c: 
test_ro("999999999999999999999.999", 0, CEILING);
    test_da("5", "-6.0");
ignore:
  added gdbinit
 2004-11-08 10:06:32 +01:00
petr@mysql.com
b2e3626e52 fix for the IM linking problem 2004-11-06 02:14:56 +03:00
joerg@mysql.com
16b280b11d Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the source tar-ball. 2004-11-05 15:50:53 +01:00
serg@serg.mylan
353dd4fe35 dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features 
charset2html moved from mysys to extra
ignore: new files added, garbage removed
 2004-11-04 22:29:00 +01:00
petr@mysql.com
96aa04bf8e protability fix 2004-11-04 11:24:14 +03:00
monty@mysql.com
7d3be517a4 Merge on pull 2004-11-03 13:01:38 +02:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
timour@mysql.com
b67f86728b Fix for BUG#6303 + fix for discovered bug with sub-queries when analyzin queries for MIN/MAX optimization (WL#1724). 2004-10-29 18:20:09 +03:00
serg@serg.mylan
0ad752e8af s/puts/printf/ 2004-10-21 15:34:26 +02:00
igor@rurik.mysql.com
a03e5ad8e4 Merge for post-merge fixes for Item_equal patch. 2004-10-19 16:07:10 -07:00
serg@serg.mylan
f7419aaa61 Merge bk-internal:/home/bk/mysql-5.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-10-18 14:09:41 +02:00
serg@serg.mylan
bd10f962f2 arbitrary precision decimal numbers 2004-10-18 14:06:46 +02:00
timour@mysql.com
3bb2c4e325 After merge adjustment of tests due to changes in cost estimates. 2004-10-11 20:10:07 +03:00
igor@rurik.mysql.com
71f6ab7a09 Merge for Item_equal. 2004-10-09 10:34:13 -07:00
bell@sanja.is.com.ua
4cb6527421 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
 2004-09-10 13:11:33 +03:00
bell@sanja.is.com.ua
a7de21c3e0 thd pointer fixed 2004-09-10 13:09:27 +03:00
dlenev@brandersnatch.localdomain
7c8213ea20 Fixed --with-embedded builds. 
Added previously missing sql_trigger.cc file to embedded library.
 2004-09-10 10:29:08 +04:00
monty@mysql.com
31122efde7 Merge with 4.1 
(Includes merge of arena code in 4.1 and 5.0)
 2004-09-06 15:14:10 +03:00
serg@serg.mylan
7ac525fc1b union.test: drop table added 2004-09-05 11:27:31 +02:00
serg@serg.mylan
b5b7603542 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-24 22:02:08 +02:00
serg@serg.mylan
0dc5945b19 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-24 21:07:08 +02:00
vva@eagle.mysql.r18.ru
3e6d1022d6 upgrade to libedit-2.6.7 
(fixed Bug #4462 libedit compile failure)
 2004-08-24 20:41:41 +05:00
serg@serg.mylan
62722e7b05 merged 2004-08-20 00:52:43 +02:00
serg@serg.mylan
3f2210c064 after merge fixes 2004-08-19 03:02:09 +02:00
serg@serg.mylan
754fafd28f copied new my_vsnprintf from 4.1. use "ul" when merging 2004-08-19 02:35:59 +02:00
joreland@mysql.com
556488dcd2 Added more ndb binaries to ignore 2004-08-12 12:37:16 +02:00
joreland@mysql.com
d913e55e1b Add ndb binaries to ignore list 2004-08-12 07:48:18 +02:00
konstantin@mysql.com
d3e520ce7e Port of cursors to be pushed into 5.0 tree: 
- client side part is simple and may be considered stable
- server side part now just joggles with THD state to save execution
  state and has no additional locking wisdom.
  Lot's of it are to be rewritten.
 2004-08-03 03:32:21 -07:00
bell@sanja.is.com.ua
bbe121c0c9 memory leak removing 2004-07-16 15:20:51 +03:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
monty@mysql.com
137b8517c4 Cleanup for creating windows source distribution 2004-06-26 10:57:00 +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
674a1c4e18 - fixed test_frm_bug test to work with increased number of columns in 
result of SHOW TABLE STATUS
 2004-06-24 20:08:42 +04:00
dlenev@brandersnatch.localdomain
47e03a0099 Final solution to mysql_tzinfo_to_sql problem. 2004-06-23 13:07:00 +04:00
dlenev@brandersnatch.localdomain
c110ec1a22 Fix for build from bk failures with old automake. 
mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made 
compatible with older automake versions.
 2004-06-22 23:36:26 +04:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03: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
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
pem@mysql.com
71eddc362e Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
pem@mysql.com
df69f93ae9 Post-merge post-merge fix (new error codes for fparser). 2004-05-14 16:10:31 +02:00
hf@deer.(none)
a4bbf5d15b client_test with embedded library will be built so one can check if he broke 
something in embedded PS
 2004-05-13 10:30:42 +05: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
bell@sanja.is.com.ua
3c5cec08c0 file parser for new .frm 2004-05-11 23:23:49 +03:00