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

5604 commits

Author SHA1 Message Date
joreland@mysql.com
2953a79835 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-05 07:17:53 +01:00
joreland@mysql.com
7fba2bf3aa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-05 07:16:07 +01:00
sergefp@mysql.com
fb113b94e4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug7816
 2005-02-05 01:53:12 +03:00
sergefp@mysql.com
72c473ec58 Merge mysql.com:/home/psergey/mysql-4.1-bug7816 
into mysql.com:/home/psergey/mysql-5.0-bug7716
 2005-02-05 01:52:17 +03:00
guilhem@mysql.com
44c2dcff36 Fix for BUG#8055 "Trouble with replication from temporary tables and ignores": 
when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*.
 2005-02-04 22:43:54 +01:00
jimw@mysql.com
14bb626dff Update test results 2005-02-04 12:59:02 -08:00
jimw@mysql.com
8c8553af81 Merge changes 2005-02-04 11:59:02 -08:00
jimw@mysql.com
b509f2b373 Merge mysql.com:/home/jimw/my/mysql-4.1-6067 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-04 10:39:13 -08:00
mysqldev@mysql.com
79b88ead4a Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/mysqldev/tulin/mysql-4.1
 2005-02-04 18:45:02 +01:00
tulin@mysql.com
d017a604fe Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/mysqldev/tulin/mysql-5.0
 2005-02-04 17:32:18 +01:00
kent@mysql.com
d1abda58b3 mysql-test-run.sh: 
USE_RUNNING_SERVER should be set to 0 or 1
 2005-02-04 17:24:18 +01:00
hf@deer.(none)
40fe0b3971 Embedded version of test fixed 2005-02-04 19:12:15 +04:00
msvensson@neptunus.homeip.net
c9d7cd043b Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
 2005-02-04 15:13:45 +01:00
mysqldev@mysql.com
753ea29f86 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/mysqldev/tulin/mysql-4.1
 2005-02-04 14:29:52 +01:00
mysqldev@mysql.com
abf7837fbb resolved merge conflict 2005-02-04 14:27:09 +01:00
tomas@poseidon.ndb.mysql.com
27a69e573a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-02-04 14:27:08 +01:00
tomas@poseidon.ndb.mysql.com
7fd685ffe8 added test to trigger drifferent fragmentations in ndb 
corrected documentation on fragmentation
    set "fragmentation medium" to mean 2 fragments per node instead of 1
    set default fragmentation to small instead of medium
    bug#8284 adjust fragmentation to max_rows
 2005-02-04 14:25:08 +01:00
gluh@gluh.mysql.r18.ru
b0bf195064 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
 2005-02-04 16:24:00 +03:00
gluh@gluh.mysql.r18.ru
e9ce96c5cd Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
 2005-02-04 15:47:12 +03:00
gluh@gluh.mysql.r18.ru
34915f7a91 A fix: bug#6931: Date Type column problem when using UNION-Table 
bug#7833:  Wrong datatype of aggregate column is returned
 2005-02-04 15:31:36 +03:00
ramil@mysql.com
0d7228fff2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1
 2005-02-04 15:53:14 +04:00
ramil@mysql.com
f76ccd63cb type_float.result.es updated. 2005-02-04 15:35:08 +04:00
timour@mysql.com
922084c1ec Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/timka/mysql/src/4.1-virgin
 2005-02-04 12:39:59 +02:00
ramil@mysql.com
2442a2d729 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-02-04 14:39:36 +04:00
ramil@mysql.com
f271a75414 type_ranges.result.es updated. 2005-02-04 14:35:56 +04:00
kent@mysql.com
68aefd155c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-02-04 11:00:34 +01:00
timour@mysql.com
e6150c7289 Merge mysql.com:/home/timka/mysql/src/4.1-dbg 
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
 2005-02-04 11:58:59 +02:00
msvensson@neptunus.homeip.net
e54ea9189d Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
ramil@mysql.com
7a00d082cf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-02-04 13:55:13 +04:00
ramil@mysql.com
e8ed450e15 type_float.result.es updated 2005-02-04 13:51:37 +04:00
gluh@gluh.mysql.r18.ru
11435fdfad Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-04 12:37:18 +03:00
pekka@mysql.com
8e4fca2a55 Merge 2005-02-04 10:35:09 +01:00
kent@mysql.com
b436e0fa8c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-02-04 08:59:58 +01:00
sergefp@mysql.com
38339e1c51 Fix for BUG#7716: in in_string::set() take into account that the value returned 
by item->val_str() may be a substring of the passed string. 
Disallow string=its_substring assignment in String::operator=().
 2005-02-04 09:14:22 +03:00
joreland@mysql.com
fcdbaf1071 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-04 06:10:56 +01:00
joreland@mysql.com
58e336764a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-04 06:09:43 +01:00
jimw@mysql.com
f32c61fbaf Handle backslashes correctly in strings that also have doubled quotes when 
we are using the NO_BACKSLASH_ESCAPES SQL mode. (Bug #6368)
 2005-02-03 16:14:02 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
b823638f38 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug6726
 2005-02-03 23:14:47 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
d794406f64 Bug#6726 - failure to parse NOT BETWEEN 
Fix and test for parse bug
 2005-02-03 23:08:43 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
1cb1dcb0f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057
 2005-02-03 21:16:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b8ceaa4a1f Bug#8057 
Fix crash with LAST_INSERT_ID() in UPDATE,
  Tests included,
 2005-02-03 21:11:12 +00:00
kent@mysql.com
725877e5fa mtr_cases.pl: 
new file
 2005-02-03 21:50:56 +01:00
guilhem@mysql.com
2832462376 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-02-03 21:26:53 +01:00
guilhem@mysql.com
0ba8a3d48b result update after merge 2005-02-03 21:24:27 +01:00
kent@mysql.com
796d00f8ea Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-02-03 21:16:04 +01:00
kent@mysql.com
1f088e95d3 mysql-test-run.pl: 
Let --start-and-exit actually start a server
  Added that test case names can be specified on the comman line
  Added embedded server support
  Added environment variables UMASK, UMASK_DIR
  Added missing MASTER_MYSOCK1, MASTER_MYPORT1, USE_RUNNING_SERVER
  Added missing CHARSETSDIR, MYSQL_FIX_SYSTEM_TABLES, MYSQL_CLIENT_TEST
  Pass on return value from sleep_until_file_created(), to fail test
  Fail test if early termination of mysqld servers
  Create intial databases for the second master, and two additional slaves
mtr_process.pl:
  Find out if port is still in use, using simple TCP connect
  Use non blocking waitpid() to catch terminations early
  Make a special case spawning the 'mysqltest' application
  Redo the fork() if it returns EAGAIN
  Make sure to record if master or slave terminated
  Improved debugging output
  Improved code that remove PID files to avoid race
  Abort if we can't stop all mysqld servers using our ports
  Many improvements in killing mysqld servers
  Let sleep_until_file_created() catch if server died early
mtr_report.pl:
  Added option to disable test cases using <testcase>.disabled file
  If --timer, only try to open file with time data if it exists
mtr_io.pl:
  Remove starting/ending space reading server options from file
 2005-02-03 21:13:27 +01:00
guilhem@mysql.com
a85df46c01 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-02-03 18:55:29 +01:00
gluh@gluh.mysql.r18.ru
be5532d36a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-03 20:46:53 +03:00
joreland@mysql.com
4143a189c9 merge 2005-02-03 17:04:27 +01:00
joreland@mysql.com
41e70c83b6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-03 17:00:51 +01:00
monty@mysql.com
b233ddba8e After merge fixes 2005-02-03 18:00:50 +02:00
guilhem@mysql.com
ac053d80e9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-02-03 16:25:57 +01:00
guilhem@mysql.com
ed1696f6b9 WL#1062 "log charset info into all Query_log_event": 
we store 7 bytes (1 + 2*3) in every Query_log_event.
In the future if users want binlog optimized for small size and less safe,
we could add --binlog-no-charset (and binlog-no-sql-mode etc): charset info
is something by design optional (even if for now we don't offer possibility to disable it):
it's not a binlog format change.
We try to reduce the number of get_charset() calls in the slave SQL thread to a minimum
by caching the charset read from the previous event (which will often be equal to the one of the current event).
We don't use SET ONE_SHOT for charset-aware repl (we still do for timezones, will be fixed later).
No more errors if one changes the global value of charset vars on master or slave
(as we log charset info in all Query_log_event).
Not fixing Load_log_event as it will be rewritten soon by Dmitri.
Testing how mysqlbinlog behaves in rpl_charset.test.
mysqlbinlog needs to know where charset file is (to be able to convert a charset number found
in binlog (e.g. in User_var_log_event) to a charset name); mysql-test-run needs to pass
the correct value for this option to mysqlbinlog.
Many result udpates (adding charset info into every event shifts log_pos in SHOW BINLOG EVENTS).
Roughly the same job is to be done for timezones :)
 2005-02-03 16:22:16 +01:00
joreland@mysql.com
443e8be7d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-03 15:15:43 +01:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
msvensson@neptunus.homeip.net
3181f5d2b6 Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
gluh@gluh.mysql.r18.ru
cacb8d74b4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-03 11:12:01 +03:00
joreland@mysql.com
4ece8ae47d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-02 20:27:53 +01:00
monty@mysql.com
e791e86444 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 20:30:57 +02:00
jimw@mysql.com
bcac063558 Fix merge of func_str tests (accidently duplicated a test). 2005-02-02 09:05:52 -08:00
jimw@mysql.com
5f0c4ff140 Merge fixes for #8248, #5569. 2005-02-02 08:21:11 -08:00
wax@mysql.com
ca2f539273 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1test2
 2005-02-02 19:55:39 +05:00
wax@kishkin.ru
b93102422b WL#964 
renamed client_test to mysql_client_test
    fixed name for lstat in removef()
    added mysql-debug.exe for Windows
    added enviroment variable MYSQL_CLIENT_TEST
    added cleaning directory before tests
    New BitKeeper file ``VC++Files/tests/mysql_client_test.dsp''
    Delete: VC++Files/tests/client_test.dsp
 2005-02-02 19:53:49 +05:00
monty@mysql.com
b131520f9d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 16:50:35 +02:00
joreland@mysql.com
f06452fb59 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-02 11:35:33 +01:00
igor@rurik.mysql.com
0fb0dab4ca func_str.result, func_str.test: 
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
 2005-02-01 23:34:31 -08:00
timour@mysql.com
52e904c25c Fix for BUG#8023. 
Allow LIMIT clause after DUAL.
 2005-02-02 08:38:24 +02:00
joreland@mysql.com
a0f201b288 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-02 06:33:22 +01:00
sergefp@mysql.com
9eca8dced6 Adjust test results for BUG#7634: The result of EXPLAIN is different if OS doesn't support file sizes > 2G 2005-02-02 07:51:43 +03:00
jimw@mysql.com
e86457cef0 Fix QUOTE() to not reuse the input field for output, which resulted in 
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248)
 2005-02-01 18:29:10 -08:00
jimw@mysql.com
891e8d076c Fix value of YEAR field when set from a non-numeric string. (Bug #6067) 2005-02-01 15:08:31 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc WL#1967 
Support for COMMIT/ROLLBACK optional arguments
 2005-02-01 19:48:05 +00:00
joreland@mysql.com
ebfa526990 merge 2005-02-01 17:16:05 +01:00
joreland@mysql.com
1839f7407e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-01 17:09:36 +01:00
joreland@mysql.com
46a75d5996 ndb - Put all output from ndb tools during mysql-test-run into log file 2005-02-01 17:08:39 +01:00
msvensson@neptunus.homeip.net
efd5ed2f9e WL#2269 Enable query cache for NDB 
- Added a thread that fetches commit_count for open tables. This
will mean that NDB will not have to be contacted for every use of a cached query.
 2005-02-01 15:43:08 +01:00
monty@mysql.com
b87e0c52a7 Proper fix for comparision with ' ' 
(Bug #7788 "Table is full" occurs during a multitable update")
 2005-02-01 16:27:08 +02:00
wax@mysql.com
ea54b00e42 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1test2
 2005-02-01 18:34:54 +05:00
bar@mysql.com
b9054c5e4a Skip cp932 and eucjpms tests when the character sets are not compiled. 2005-02-01 14:37:51 +04:00
gluh@gluh.mysql.r18.ru
92f04aedf3 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-01 12:20:03 +03:00
bell@sanja.is.com.ua
48da18cd45 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-02-01 11:05:29 +02:00
jimw@mysql.com
36d5d82ab5 Update client_xml test to avoid timestamp-sensitive part of test. 2005-01-31 18:48:42 -08:00
jimw@mysql.com
85a5c61c5d Merge mysql.com:/home/jimw/my/mysql-4.1-7811 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-31 17:51:45 -08:00
jimw@mysql.com
6056009782 Update test results after bug-fix merge. 2005-01-31 17:31:42 -08:00
jimw@mysql.com
b7dda3f7c0 Merge 2005-01-31 16:27:17 -08:00
jimw@mysql.com
61874f07df Merge mysql.com:/home/jimw/my/mysql-4.1-8134 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-31 15:29:55 -08:00
jimw@mysql.com
b4caa3aad5 Merge mysql.com:/home/jimw/my/mysql-4.1-8148 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-31 15:28:33 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
adb91423ac Bug#7011 
Merge from 4.1
 2005-01-31 15:57:32 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
18084f54c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug7011.4
 2005-01-31 15:06:04 +00:00
wax@mysql.com
2251593a09 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1test2
 2005-01-31 19:23:19 +05:00
wax@kishkin.ru
6ba40427ba WL#964 
added client_test.dsp in project
    added CHARACTER SET in tables
    added 5th time zone
    included lstat in if()
    expanded ignore list for windows
    added directory slave1 and slave2
    added options for mysqld and mysqltest
    fixed error in read_option()
    fixed and added enviroment variables for Linux and Windows
    rewrote str_tok()
    added replacment 3th column
    New BitKeeper file ``VC++Files/tests/client_test.dsp''
 2005-01-31 19:18:06 +05:00
gluh@gluh.mysql.r18.ru
a899655e7a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-31 17:13:03 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
ba716c80f1 Bug#7011 
Fix tests after merge from 4.0
 2005-01-31 13:18:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04 Bug#7011 
Merge from 4.0
 2005-01-31 12:48:00 +00:00
gluh@gluh.mysql.r18.ru
89ba364e03 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-31 13:36:05 +03:00
kent@mysql.com
89b3897005 Merge 2005-01-31 10:24:33 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
500fbf5c0f Bug#7011 
Fix replication for multi-update
  new test - rpl_multi_update2
 2005-01-30 10:24:03 +00:00
kent@mysql.com
b0d2e3c9d9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-30 00:32:14 +01:00
dlenev@mysql.com
922f0b007c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-29 19:57:29 +03:00
kent@mysql.com
57fce07b31 mysql-test-run.sh: 
Old Solaris 'test' lack -e
 2005-01-29 15:59:29 +01:00