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

573 commits

Author SHA1 Message Date
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
SergeyV@selena.
be18f91a01 Added number of files into ignore list for win32 build within bk tree. 2005-11-14 16:36:05 +03:00
jimw@mysql.com
2e13e29a29 Add generated files to ignore list 2005-11-07 16:39:20 -08:00
monty@mysql.com
cdf64f0f57 Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree) 
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
 2005-11-05 13:20:35 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
jimw@mysql.com
dcd8b9a503 Add files for bdb/build_win64, and tweak the configuration to skip over 
parts of the library we have omitted.
 2005-09-22 16:42:39 -07:00
jimw@mysql.com
b75cc41b7b Remove some files that should not have been added with BDB upgrade, 
and update ignore file after move of storage engines to storage/.
 2005-09-22 15:53:18 -07:00
konstantin@mysql.com
2d4c54ba1b Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-09-23 00:46:59 +04:00
monty@mysql.com
82fc54781b Fixed problems found by valgrind 
Fixed problems in test suite where some test failed
Fixed access to not initialized memory in federated
Fixed access to not initialized memory when using BIT fields in internal temporary tables
 2005-09-22 03:23:07 +03:00
monty@mysql.com
9727fe5abf Merge mysql.com:/home/my/mysql-4.0 
into  mysql.com:/home/my/mysql-4.1
 2005-09-15 17:17:26 +03:00
monty@mysql.com
444dbfaf17 Turn off EOLN_NATIVE flag for all test files 
Ignored some generated files
 2005-09-15 17:14:39 +03:00
jonas@eel.(none)
2bd9c2d6f6 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-5.0
 2005-09-09 12:54:03 +02:00
jonas@eel.(none)
6ec3fa6ac1 ndb 
new testprogram testSRBank
 2005-09-09 12:39:06 +02:00
jan@hundin.mysql.fi
fc4fea68ad Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/new/mysql-5.0
 2005-09-05 08:35:58 +03:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1 
into  mishka.local:/home/my/mysql-5.0
 2005-08-25 06:55:48 +03:00
sasha@asksasha.com
c594ab7921 updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). 
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of 
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query 
logging does work.
 2005-08-18 21:40:14 -06:00
serg@sergbook.mysql.com
d689d415b3 forgotten 'return' 2005-08-14 23:20:06 +02:00
monty@mysql.com
15d48525af Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2005-07-28 17:09:54 +03:00
monty@mysql.com
af6863e7d0 Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected 2005-07-27 13:45:06 +03:00
monty@mysql.com
24d45c5c30 Merge mysql.com:/home/my/mysql-4.0 
into  mysql.com:/home/my/mysql-4.1
 2005-07-27 13:24:59 +03:00
monty@mysql.com
4098c40d87 Review fixes: 
Fixed portability problem with bool in C programs
Moved close_thread_tables out from LOCK_thread_count mutex (safety fix)
my_sleep() -> pthread_cond_timedwait()
 2005-07-26 17:55:58 +03:00
jan@hundin.mysql.fi
5607acde81 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/new/mysql-5.0
 2005-07-20 13:47:05 +03:00
konstantin@mysql.com
15ef68df0f Ignore mysql-test/var (I'm pushing it for the second time already :(() 2005-07-20 00:02:49 +04:00
konstantin@mysql.com
d2814fb1b5 Added mkinstalldirs (an auxiliary autotools symlink) to the ignore 
list.
 2005-07-19 11:35:16 +04:00
jan@hundin.mysql.fi
6aeca28a96 Added InnoDB offline file checksum utility. 2005-07-19 10:03:19 +03:00
timour@mysql.com
3220f721dd Fix for BUG#11211 "GROUP BY doesn't work correctly" 
When the GROUP BY clause contains a column reference that can be resolved to
both an aliased column in the SELECT list, and to a column in the FROM clause,
the group column is resolved to the column in the FROM clause (for ANSI conformance).
However, it may be so that the user's intent is just the other way around, and he/she
gets the query results grouped by a completely different column than expexted.
This patch adds a warning in such cases that tells the user that there is potential
ambiguity in the group column.

sql/sql_select.cc
- Added a warning when a GROUP column is ambiguous due to that there is a
  column reference with the same name both in the SELECT and FROM clauses.
  In this case we resolve to the column in FROM clause and warn the user
  of a possible ambiguity.
- More extensive comments.
- Changed the function to return bool instead of int (as in other places).

mysql-test/t/group_by.test
  Added test for BUG#11211.

mysql-test/r/group_by.result
  Added test for BUG#11211.
 2005-06-15 10:12:49 +03:00
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
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
serg@serg.mylan
0c281ecd7e symlink a whole dir, not individual files (symlinking individual files is one subdir below and results in broken links) 2004-04-26 13:27:23 +02:00
serg@sergbook.mylan
606073084e symlink, not hardlink 
mkdir in Makefile, not in configure
chmod a-x
 2004-04-21 14:55:39 -05:00
magnus@neptunus.(none)
770fe3fc91 More files to ignore 2004-04-14 13:15:18 +02:00
magnus@neptunus.(none)
75317dafdc Ignore .depend and .depend.mk 2004-04-14 13:11:30 +02:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
ingo@mysql.com
4de7e18b81 Hand-resolved auto merge 2004-04-07 14:56:24 +02:00
ingo@mysql.com
376f252659 ignore: 
added install
 2004-04-07 13:57:09 +02:00
lenz@kallisto.local
bbbb3f6540 - install all *.sql files into the "shared" directory for the binary tar.gz 
distribution (this is more in line with how "make install" would install
   them) - this should also fix a test failure in the "system_mysql_db_fix"
   test.
 2004-04-01 17:34:26 +02:00
serg@serg.mylan
ed2e1aa14d my_gethwaddr() for linux/freebsd 
UUID() function
 2004-02-27 20:30:08 +01:00
monty@mashka.mysql.fi
3b83cce5eb merge with 4.0 2004-02-22 09:50:59 +02:00
serg@serg.mylan
870a7f23d6 ignore: 
added scripts/make_win_binary_distribution
 2004-02-21 14:00:54 +01:00
serg@serg.mylan
6af8a93052 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-02-17 17:07:14 +01:00
serg@serg.mylan
de240a1ce2 ft_boolean_syntax made changeable 2004-02-16 18:53:00 +01:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
konstantin@mysql.com
2a4cfe8b4f merge 3.23 -> 4.0, 2003/02/06 2004-02-06 15:23:41 +03:00
lenz@mysql.com
9736c9c457 - renamed myisam/ft_dump to myisam/mysam_ftdump and added it to the 
binary distribution and Server RPM
 2004-02-03 22:25:02 +01:00
monty@mysql.com
151b558e21 Mark that strings may change on index only reads (for BDB tables). 
This fixed problem with index reads on character fields with BDB tables. (Bug #2509)
 2004-01-29 15:16:48 +01:00
igor@rurik.mysql.com
c236568ac9 Auto Merge 2003-12-23 02:24:12 -08:00
monty@mysql.com
c6ed2a625b Update for VC++ 
(Fixed project files, compiler warnings etc..)
 2003-12-21 02:07:45 +02:00
igor@rurik.mysql.com
d64bdafb4c Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2003-12-08 11:26:34 -08:00
pem@mysql.com
63f4858030 Merged 4.1 -> 5.0 2003-12-05 13:11:50 +01:00
lenz@kallisto.local
84acc2054f - Bumped up version number in configure.in 4.1.1-alpha -> 4.1.2-alpha 
- tagged ChangeSet 1.1641 as "mysql-4.1.1"
 2003-12-04 15:20:44 +01:00
igor@rurik.mysql.com
580b878562 The output of explain command for some queries has changed 
after introducing Item_equal.
 2003-12-02 16:41:53 -08:00
pem@mysql.com
6e717133c5 Merge 4.1 to 5.0 2003-12-01 16:14:40 +01:00
konstantin@oak.local
ad74f5bfe5 misplaced comment moved to relevant line 2003-11-25 15:28:43 +03:00
serg@serg.mylan
201f27702a ignore: 
added sql/udf_example.so scripts/make_win_src_distribution
 2003-11-19 23:11:27 +01:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
serg@serg.mylan
60d60a299e Item_uint::save_in_field() added to take into account bigint->decimal case 2003-11-16 17:37:15 +01:00
monty@narttu.mysql.fi
6b79cd5c23 Merge 2003-11-03 22:48:03 +02:00
monty@narttu.mysql.fi
085b1c5608 Some simple things missing for last changeset 2003-11-03 22:18:16 +02:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
serg@serg.mylan
f944fd4a65 merged 2003-10-21 11:58:43 +02:00
serg@serg.mylan
50d9b95b77 merged 2003-10-15 12:25:44 +02:00
monty@mashka.mysql.fi
e71b53a8fe merge with 4.0 to get fix for SET enum_system_variable=NULL 2003-10-14 16:34:09 +03:00
monty@mashka.mysql.fi
2d3840f550 Fixed bug in SET enum_system_variable=NULL 2003-10-14 16:30:42 +03:00
serg@serg.mylan
8cc3951c8f key_map with more that 64 bits width 2003-10-11 13:06:55 +02:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
greg@mysql.com
564dad6c53 Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999 2003-09-15 17:39:50 -04:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
kostja@oak.local
711a3f6806 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into oak.local:/home/kostja/mysql/mysql-4.1-root
 2003-09-03 16:44:40 +04:00
dlenev@dlenev.mshome
bd49884c19 Added automatically created SSL certificates from mysql-test/std_data 
to ignore list.
 2003-09-03 12:19:30 +04:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
66b160c253 vio ssl structure renames (to get rid of ending _) 
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
 2003-08-27 02:51:39 +03:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
lenz@mysql.com
927dff6c47 - Added some files to support-files/MacOSX to enable building the Mac OS X 
startup item: MySQL (the startup script), StartupItem.Description.plist,
   StartupItem.Info.plist (PKGMaker control files), StartupItem.postinstall
   (post-installation script for the Startup Item package)
 - modified support-files/MacOSX/Makefile.am to include the newly added files
   in the source distribution
 2003-08-15 14:55:05 +02:00
kostja@oak.local
50d3291aee manual merge 2003-07-31 17:11:52 +04:00
bell@sanja.is.com.ua
19efafcc13 allow to look up queries with leading comments 2003-07-18 16:34:50 +03:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
kostja@oak.local
1d20b23247 Bug fixes for authentication 
OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions.
 2003-07-04 20:52:04 +04:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1) 
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
 2003-07-01 23:40:59 +04:00
hf@deer.(none)
c4e3a624b8 SCRUM 
client capabilities included into libmysqld
some API methods became "virtual"
lots of duplicated code removed

IMHO all the above made library's code way more pleasant to look at, didn't it?
 2003-06-17 21:32:31 +05:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol 
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
 2003-06-04 18:28:51 +03:00
hf@deer.(none)
5990e7c38e Obsolete files removed 2003-06-03 15:27:17 +05:00
ram@mysql.r18.ru
e15ea0291a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/work/4.1.latest
 2003-05-30 23:09:34 +05:00
ram@mysql.r18.ru
a36d4212fc Moved spatial functions to the sql/item_geofunc.cc file. 2003-05-30 15:22:34 +05:00
bar@bar.mysql.r18.ru
81f0fb6e18 character_set_server is now updatable 
character_set_database was added
Code optimization: reuse more code for all character sets variables
 2003-05-30 13:03:56 +05:00
monty@mashka.mysql.fi
944bc89561 Updated results & after merge fix 2003-05-22 11:58:39 +03:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
e2fc4f0b71 Fix to get thread_test to compile 2003-05-15 17:50:57 +03:00
pem@mysql.com
35c82164f6 Merged 4.1 to 5.0. 2003-04-29 12:06:04 +02:00
lenz@mysql.com
75c5ebe659 - minor fixups (no more warnings) 
- the preferred mailing list is internals@ not dev-public@
   (this is a public document)
 - Rather use the 4.1 tree for new development (4.0 is frozen)
 2003-04-29 09:52:14 +02:00
hf@deer.mysql.r18.ru
6a83d37532 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor
 2003-04-28 14:29:22 +05:00
hf@deer.mysql.r18.ru
d69b5c4d69 SCRUM 
Protocol_cursor task
net_field_length definitions trimmed with Monty's suggestions
 2003-04-28 14:25:29 +05:00
lenz@mysql.com
3d19d37c46 - Updated innodb test results on Heikki's request (InnoDB now supports 
ANALYZE TABLE)
 2003-04-25 14:42:01 +02:00
bell@sanja.is.com.ua
b9a4bf8cad subselect in procedure argument list (Bug #302) 2003-04-23 22:31:47 +03:00
bar@bar.mysql.r18.ru
6d5f527afd Variable names have been renamed: 
client_collation -> collation_client
  result_collation -> collation_results
  connection_collation -> collation_connection
 2003-04-23 18:19:22 +05:00
serg@sergbook.mysql.com
e9492a1d83 ft benchmark suite: initial checkin 2003-03-29 20:40:03 +03:00
monty@mashka.mysql.fi
d56e2acf50 Merge to get fix for LOCK TABLES + DROP TABLE in another thread 2003-03-07 01:20:56 +02:00
serg@serg.mysql.com
80c34b2aef fixed Field::eq() to work with CHAR(0) fields 2003-03-04 18:02:56 +01:00
serg@serg.mysql.com
35636c6bd0 Merge work:/home/bk/mysql-4.1 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2003-03-01 14:18:55 +01:00
monty@narttu.mysql.fi
3b073a08e0 Portability fixes 
Don't define crc32 if we are not linking with gzip
 2003-02-27 03:44:44 +02:00