Commit graph

4147 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
4ead61f873 code cleanup 2003-05-26 15:08:17 +03:00
monty@narttu.mysql.fi
17dfc88105 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-26 13:36:43 +03:00
monty@narttu.mysql.fi
48ecf0e8a7 Fixed core dump bug when shuting down mysqld 2003-05-26 13:10:08 +03:00
monty@narttu.mysql.fi
102c477760 Added testing of LOAD DATA ... STARTING BY
Added read_only variable
2003-05-26 11:47:03 +03:00
monty@mashka.mysql.fi
9f3ade0670 Added missing free for last patch 2003-05-26 06:16:50 +03:00
guilhem@mysql.com
9ed9ad5374 - Fix for memory leak if the SQL slave thread is killed just after reading an event.
- A few more mutex locks and unlocks of rli.log_space_lock for doing clean reads of
rli.ignore_log_space_limit
- Broadcast after unlock, not before (small speed optimisation).
2003-05-25 23:09:46 +02:00
heikki@hundin.mysql.fi
11ae9595c7 log.cc:
If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1
2003-05-25 23:37:32 +03:00
guilhem@mysql.com
8a1e18f4cb Fix for bug #490 and #491 (see details below) 2003-05-24 16:43:53 +02:00
guilhem@mysql.com
0b875e908f Fix for #468 [Ver]: SHOW VARIABLES trims innodb_data_file_path
(this bug was already fixed in 4.0, I just copied and pasted two lines).
2003-05-23 16:40:21 +02:00
bar@bar.mysql.r18.ru
70559621f2 latin7.xml:
c
Index.xml:
  Collation names form lati7 were mixed
2003-05-23 18:54:48 +05:00
bar@bar.mysql.r18.ru
78c7d40986 BINARY collations for every character set 2003-05-23 18:39:55 +05:00
bar@bar.mysql.r18.ru
8192d169a2 CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
bar@bar.mysql.r18.ru
2eccde258d Character set sets now check if required non-dynamic charsets were really compiled 2003-05-23 15:10:05 +05:00
bar@bar.mysql.r18.ru
06acc76392 convert.cc was removed 2003-05-23 14:02:27 +05:00
bar@bar.mysql.r18.ru
a238efaa63 SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility:
Character set is not displayed in "Type" column anymore
In "Collation" column NULL instead of BINARY is now displayd for for non-character data types
2003-05-23 13:10:25 +05:00
bar@bar.mysql.r18.ru
895db718ec Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-23 11:33:02 +05:00
bar@bar.mysql.r18.ru
8514caa1da CREATE TABLE t1 SELECT left(_latin2'a',1) didn't work, the charset got lost
Collation and coercibility tests for string functions
2003-05-23 11:32:35 +05:00
administrador@light.hegel.local
76feb41130 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into light.hegel.local:C:/mysql-dev/mysql-4.1
2003-05-23 03:10:35 -03:00
administrador@light.hegel.local
cded59cbd7 Translation English -> Protuguese 2003-05-23 03:06:00 -03:00
bar@bar.mysql.r18.ru
ff02bddc1a Automatic conversion into supersets (utf8, ucs2) for comparison in some cases
USER(), DATABASE() and VERSION() return in utf8 now
2003-05-23 10:45:46 +05:00
bar@bar.mysql.r18.ru
5b643e5527 USER, DATABASE and VERSION functions returns now IMPLICIT coercibility 2003-05-22 18:41:47 +05:00
bar@bar.mysql.r18.ru
f6a7dd7491 mysqld.cc:
default_collation is now displayed correctly in mysqld --help
  mysqld --help now displays default_collation corretly, according to --default-character-set
2003-05-22 18:22:21 +05:00
bar@bar.mysql.r18.ru
2b1e1f6494 Variables were rename, binary collation names were added
Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled
2003-05-22 17:20:19 +05:00
bar@bar.mysql.r18.ru
79326cf901 Index.xml:
Typos fixes
2003-05-22 16:57:06 +05:00
monty@mashka.mysql.fi
944bc89561 Updated results & after merge fix 2003-05-22 11:58:39 +03:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
bell@sanja.is.com.ua
32262a0fd5 fixed subqueries name resolution with INSERT/REPLACE (found during bug 446 investigation) 2003-05-21 23:35:51 +03:00
vva@eagle.mysql.r18.ru
6b5c9851a4 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-3.23
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-3.23
2003-05-21 15:18:30 -04:00
vva@eagle.mysql.r18.ru
4ae8af4ae2 fixed "LINES STARTING" in load data replication 2003-05-21 15:16:56 -04:00
vva@eagle.mysql.r18.ru
d124cd5bd7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.0
2003-05-21 14:58:11 -04:00
vva@eagle.mysql.r18.ru
09348e271a fixed 'STARTING BY' in replication 2003-05-21 14:54:02 -04:00
monty@mashka.mysql.fi
6aa8929cf3 After merge fixes
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
bar@bar.mysql.r18.ru
8d52377a5c Some SHOW VARIABLES have been renamed:
collation_client  -> character_set_client
collation_results -> character_set_results
character_set     -> character_set_server

SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
2003-05-21 17:44:12 +05:00
bar@bar.mysql.r18.ru
189d1373b8 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-21 13:59:00 +05:00
bar@bar.mysql.r18.ru
7f771ce2e1 "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
"character_set_system" has been added to display the system character set
2003-05-21 13:58:30 +05:00
bar@bar.mysql.r18.ru
c725a34b80 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-21 13:34:07 +05:00
venu@myvenu.com
3f1a05d316 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-05-21 01:21:51 -07:00
venu@myvenu.com
0c25993d24 Fix merge conflict by changing warning codes to new one 2003-05-21 01:21:06 -07:00
ram@mysql.r18.ru
13607aedd8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.latest
2003-05-21 12:27:27 +05:00
bar@bar.mysql.r18.ru
76900a9f4b Two separate startup arguments for mysqld:
--default-character-set and --default-collation
2003-05-21 12:26:35 +05:00
ram@mysql.r18.ru
d90720704b Added AsBinary alias for AsWKB function. 2003-05-21 12:26:06 +05:00
venu@myvenu.com
97a2c472bc Resolve merge conflict 2003-05-21 00:14:56 -07:00
venu@myvenu.com
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00
wax@kishkin.ru
93325f7b6c add check of __NT__ definition for shared_memory for tree 4.1 2003-05-21 04:57:59 +06:00
vva@eagle.mysql.r18.ru
666d46b6ee Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.1
2003-05-20 17:03:50 -04:00
vva@eagle.mysql.r18.ru
ec247fd6af changed processing of LOAD DATA in mysqlbinlog 2003-05-20 17:03:18 -04:00
bell@sanja.is.com.ua
5e03ab83a8 do not find keys in external fields (bug 446 related) 2003-05-20 17:09:53 +03:00
bar@bar.mysql.r18.ru
5b788e660a A separate, better error message when it's impossible to aggregate strings for some operation 2003-05-20 16:36:59 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
bell@sanja.is.com.ua
9e8c3a6fac fixed bugs 442/443 (reduced subselect in ORDER/GROUP clauses) 2003-05-19 15:32:38 +03:00