Commit graph

7573 commits

Author SHA1 Message Date
serg@serg.mysql.com
6897b00216 --new option and local variable to optionally turn on
"very new functions" - for now 4.1-compatible TIMESTAMT format
2003-03-05 18:43:56 +01:00
monty@mashka.mysql.fi
9257a27c82 Fixed character set bug when replicating user variables 2003-03-05 16:10:40 +02:00
Sinisa@sinisa.nasamreza.org
c643298984 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-05 15:45:11 +02:00
Sinisa@sinisa.nasamreza.org
9034ed296b A better, but larger fix for server_id bug .. 2003-03-05 15:34:58 +02:00
bar@bar.mysql.r18.ru
78dff8fc2e Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-05 16:43:43 +04:00
bar@bar.mysql.r18.ru
f5d6b4952f New fields in CHARSET_INFO structure to optimize searching for
binary and primary collations in the future
2003-03-05 16:43:10 +04:00
serg@serg.mysql.com
0309191c37 my_dir.h is included by raid.h 2003-03-05 13:10:23 +01:00
ram@mysql.r18.ru
008b9361bb Bug fix: we should set proper my_errno 2003-03-05 16:07:12 +04:00
lenz@mysql.com
908bf23cfc - Fixed URL to Using_stack_trace.html (the old one still works, but gets
redirected to the new location
2003-03-05 12:42:10 +01:00
lenz@mysql.com
f2c4b6c981 - safeguard against an endless loop when MIT pthreads are not installed
(Bug #121)
2003-03-05 09:49:28 +01:00
bar@bar.mysql.r18.ru
4f930a7c2a SET NAMES has been extended to support optional collation:
SET NAMES <charset name> [COLLATE <collation name>]
2003-03-05 12:37:39 +04:00
lenz@mysql.com
a95c024067 - typo fix (replaced blanks with a tab) 2003-03-05 08:13:37 +01:00
venu@myvenu.com
582e8b929e Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-04 14:33:25 -08:00
venu@myvenu.com
27b336c46b sql_prepare.cc:
Remove the unused code (from previous commit)
2003-03-04 14:31:42 -08:00
venu@myvenu.com
1f88025066 Fix EXPLAIN bug with binary protocol
Added new client tests (EXPLAIN + DECIMAL conv)
2003-03-04 14:22:30 -08:00
lenz@mysql.com
26f9bee733 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 22:24:00 +01:00
serg@serg.mysql.com
887553913f Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-04 21:33:32 +01:00
greg@mysql.com
f11d1c66e9 Merge gweir@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/greg/bk/mysql-4.1
2003-03-04 12:30:51 -05:00
greg@mysql.com
4309cfc25c Many files:
Change mode to -rwxrwxr-x
2003-03-04 12:30:29 -05:00
lenz@mysql.com
8cd2e70900 Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-03-04 18:26:22 +01:00
gweir@work.mysql.com
2cd7bf9969 Many files:
Change mode to -rwxrwxr-x
2003-03-04 18:20:11 +01:00
lenz@mysql.com
905ce89dc5 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 18:18:05 +01:00
heikki@hundin.mysql.fi
404116fd1d ha_innodb.cc:
Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated
2003-03-04 19:14:37 +02:00
heikki@hundin.mysql.fi
14749b89bb ha_innodb.cc:
Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash
2003-03-04 19:06:40 +02:00
serg@serg.mysql.com
e5daf6486c Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-03-04 18:03:11 +01:00
serg@serg.mysql.com
80c34b2aef fixed Field::eq() to work with CHAR(0) fields 2003-03-04 18:02:56 +01:00
Sinisa@sinisa.nasamreza.org
4d83bdef2a Fix for SHOW VARIABLES on 64-bit platforms 2003-03-04 18:23:15 +02:00
bar@bar.mysql.r18.ru
3fbd67e84e Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-04 19:54:41 +04:00
bar@bar.mysql.r18.ru
78da2ad7bd SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +04:00
greg@mysql.com[greg]
137bdcec5a novell41.patch 2003-03-04 10:34:32 -05:00
bar@bar.mysql.r18.ru
f95eb82934 stringcmp() and sortcmp() have been unified
into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.
2003-03-04 18:01:59 +04:00
monty@narttu.mysql.fi
143c85057e Fix for reading variables from binary log. 2003-03-04 15:17:29 +02:00
monty@narttu.mysql.fi
d0d071dca9 Fix for using unitialized mutex when running version compiled with --debug 2003-03-04 15:02:49 +02:00
heikki@hundin.mysql.fi
ac5135860d buf0buf.c:
Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized
2003-03-04 14:05:23 +02:00
monty@narttu.mysql.fi
21cc72bfe8 Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread and DROP TABLE in another thread 2003-03-04 13:36:59 +02:00
monty@narttu.mysql.fi
28b6e0269a Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-03-04 12:32:28 +02:00
monty@narttu.mysql.fi
2a7dfa172c Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped 2003-03-04 12:22:35 +02:00
bar@bar.mysql.r18.ru
6cbbbd6948 Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
for binary collations
2003-03-04 12:33:52 +04:00
bar@bar.mysql.r18.ru
c4dc670d61 Every character set now has binary collation 2003-03-04 11:04:19 +04:00
greg@mysql.com
61f280a978 New build scripts for NetWare 2003-03-03 23:04:36 -05:00
greg@mysql.com[greg]
8fb09059c1 novell40b.patch 2003-03-03 23:00:49 -05:00
guilhem@mysql.com
dc634a18e9 Do not give an error when the user does START SLAVE on an already
running slave, just give a warning. Same thing for STOP SLAVE.
This will make scripts writing easier for users.
2003-03-03 23:12:17 +01:00
monty@narttu.mysql.fi
8c51eb2c12 Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another 2003-03-03 20:42:49 +02:00
venu@myvenu.com
6a9273fa95 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-03 09:51:54 -08:00
lenz@mysql.com
3e3fa76919 Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-03-03 18:42:57 +01:00
heikki@hundin.mysql.fi
6ef0f4ad41 ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
2003-03-03 19:31:01 +02:00
Sinisa@sinisa.nasamreza.org
7dc464ea07 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-03 17:16:09 +02:00
lenz@mysql.com
1612991220 - added option "--skip-dmg" to skip the building of the disk image after
packaging
 - enclosed some variables in quotes for safeguarding
 - add a license file (GPL or MySQLEULA) to the package so it will be
   displayed during installation (needs to be tested)
2003-03-03 16:01:05 +01:00
heikki@hundin.mysql.fi
177f584f90 srv0start.c:
Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf
2003-03-03 16:29:16 +02:00
guilhem@mysql.com
6b4f438ddb Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations)
+ fix for #70 
+ test result fix for LOAD DATA LOCAL bug #82
2003-03-03 14:57:02 +01:00