Commit graph

10399 commits

Author SHA1 Message Date
antony@ltantony.rdg.cyberkinetica.homeunix.net
2b53eef5f0 WorkLog #1323 (part 2)
New Statement: SHOW [STORAGE] ENGINES
New System Variable: storage_engine
New mysqld Argument: --default-storage-engine=
2003-12-17 22:52:03 +00:00
jani@rhols221.adsl.netsonic.fi
abaaa0f37b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
2003-12-16 16:04:08 +02:00
jani@rhols221.adsl.netsonic.fi
5678574922 Fixed parenthesis needed by valgrind-max. 2003-12-16 16:03:39 +02:00
ram@gw.mysql.r18.ru
795c88517e proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly.
note: bar asked me to use res.charset in ::sql_type() functions to be more consistent.
2003-12-16 17:39:33 +04:00
hf@deer.(none)
0462f48b34 Missed header added 2003-12-16 16:36:12 +04:00
jani@rhols221.adsl.netsonic.fi
90a2456faf Some minor code clean up. 2003-12-16 11:44:22 +02:00
jani@rhols221.adsl.netsonic.fi
96555b5f90 Added support for multi statement tests. Use mysqltest internal
command delimiter to change the default delimiter (;) to something
else, a string upto 16 characters is allowed. Separate the sub
queries with ';' and end the whole statement with your own delimiter.
2003-12-16 06:09:44 +02:00
monty@mysql.com
cde713023a Cleanup 2003-12-16 02:23:40 +02:00
monty@mysql.com
3f4b1023d7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-15 23:18:40 +01:00
monty@mysql.com
b24671ee2d Updated results 2003-12-15 18:10:46 +01:00
ram@gw.mysql.r18.ru
05c0c4ff26 part one of the fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly 2003-12-15 21:01:38 +04:00
monty@mysql.com
76eb219781 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-15 18:02:29 +02:00
monty@mysql.com
2742701574 Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0)
nitialize system_charset_info() early. Fixes core dump when starting windows service
2003-12-15 17:58:15 +02:00
miguel@hegel.local
6e4329cbe6 Translation update 2003-12-13 18:00:15 -04:00
serg@serg.mylan
68416cc42a Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-13 18:49:45 +01:00
serg@serg.mylan
f8ed7ebbe1 insert table select * from table2 now converts charsets correctly 2003-12-13 18:49:10 +01:00
Sinisa@sinisa.nasamreza.org
35b8a0cde9 Already approved bug fix for #1561.
Bug happens in INTERVAL function when number of compared arguments
is 8 or more.
2003-12-13 17:20:35 +02:00
serg@serg.mylan
28709e8f7e Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-12 19:43:52 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
7cd80807ec Bug#2075 - fix reduce/reduce 2003-12-11 16:05:51 +00:00
serg@serg.mylan
6a7a91ba4d mysqldump version updated 2003-12-11 12:02:26 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
7f83c17637 Fix for Bug #2075 - negative default values not accepted for integer columns
Allow numeric literals have a sign
2003-12-11 00:28:25 +00:00
ram@gw.mysql.r18.ru
7576f1a81f changed usc2 -> koi8r to don't depend on extra-charset option. 2003-12-10 15:27:33 +04:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
fcf96dbb18 WorkLog#1323
Deprecate the use of TYPE=... Preferred syntax is ENGINE=
2003-12-10 04:31:42 +00:00
igor@rurik.mysql.com
28113396ec key_cache.result, key_cache.test, mf_keycache.c:
Fixed a wrong return code by the function init_key_cache.
2003-12-09 13:29:38 -08:00
ram@gw.mysql.r18.ru
f913b942a9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b1994
2003-12-09 22:00:33 +04:00
vva@eagle.mysql.r18.ru
4734f45213 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1688/mysql-4.1
2003-12-09 14:00:32 -04:00
vva@eagle.mysql.r18.ru
17330df85f Merge 2003-12-09 13:34:57 -04:00
ram@gw.mysql.r18.ru
4d1f521f21 Fix for the bug #1994: mysqldump does not correctly dump UCS2 data. 2003-12-09 15:28:58 +04:00
monty@mysql.com
c92feebb23 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-09 11:58:21 +02:00
lenz@kallisto.local
9aa12e25f1 Fixed two packaging bugs:
- postinstall of the Mac OS X PKG failed as a parameter for 
   mysql_install_db was changed for MySQL 4.1
 - postinstall of the Server RPM failed as mysql_create_system_tables was
   missing from the file list
2003-12-08 14:38:29 +01:00
konstantin@mysql.com
0600b90c7c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-08 13:31:40 +03:00
konstantin@oak.local
54f76e2c93 commented why valgrind barks at the bug #1500 2003-12-08 13:30:14 +03:00
monty@mysql.com
ca953d5e7d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-08 12:26:10 +02:00
monty@mysql.com
e8aef44349 Portability fixes for Windows 2003-12-08 12:25:37 +02:00
gluh@gluh.mysql.r18.ru
38a4780fd1 Fixed test for 'init_slave' variable 2003-12-08 12:10:30 +04:00
gluh@gluh.mysql.r18.ru
a09d6409ae post-merge fixes 2003-12-08 09:44:04 +04:00
gluh@gluh.mysql.r18.ru
b46d75f08b Task ID 499:Add a new settable string variable(init_connect, init_slave)
to mysqld that is executed for all new connections.
(Similar to the client command: mysql_options(... MYSQL_INIT_COMMAND ...).
2003-12-08 09:13:14 +04:00
serg@serg.mylan
d7f0cd241d let chk_index() understand 2-level fulltext index format 2003-12-07 20:36:45 +01:00
serg@serg.mylan
6d0703ab5b QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status 2003-12-06 23:21:09 +01:00
serg@serg.mylan
95bdc62bea Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-06 19:05:57 +01:00
serg@serg.mylan
b2e6b36487 fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
(isn't it obvious ?)
2003-12-06 19:05:26 +01:00
konstantin@mysql.com
0ca7f54b5e Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into mysql.com:/home/kostja/mysql/mysql-4.1-max_prep_stmt_count
2003-12-05 02:00:54 +03:00
konstantin@oak.local
a942f55716 unused variable max_prep_stmt_count removed 2003-12-05 01:55:57 +03:00
serg@serg.mylan
cbcb863ca5 test result fixed 2003-12-04 23:18:04 +01:00
serg@serg.mylan
b193d20001 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-04 22:07:04 +01:00
serg@serg.mylan
3f1d0acbad make a clear distinction between max_word_length in *characters* and in *bytes* 2003-12-04 21:58:28 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1f02484341 Fixup error number - Broke during merge 2003-12-04 18:09:36 +00:00
greg@mysql.com
b83f2bd350 Merge gweir@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/bk/mysql-4.1
2003-12-04 11:54:53 -05:00
greg@mysql.com
66f777d36c Add charset #defines for Windows platform (as of 4.1.1) 2003-12-04 11:54:04 -05:00
konstantin@oak.local
bab592c3c0 comment to user-level lock added 2003-12-04 19:12:01 +03:00