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

1275 commits

Author SHA1 Message Date
gluh@gluh.mysql.r18.ru
b435d6e862 Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03:00
jimw@mysql.com
1055e52575 Fix failure in 'kill' test due to change of default 
reconnect setting in mysql client library. (Bug #8866)
 2005-03-16 17:13:45 -08:00
monty@mysql.com
f42941073d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-16 22:59:06 +02:00
lars@mysql.com
fc6eda1336 Fixes after Sinisa and Serg comments after push of patch for BUG#9123. 
BUG#9123 is solved earlier than this patch though.
 2005-03-16 21:56:56 +01:00
monty@mysql.com
594ef41b2d Cleanup during reviews 
Removed some optional arguments
Fixed portability problem in federated tests
 2005-03-16 16:11:01 +02:00
dlenev@mysql.com
8df3d5b098 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
 2005-03-16 17:00:13 +03:00
lars@mysql.com
52f190c098 BUG#9123: Updates after Mats review 2005-03-16 13:57:59 +01:00
georg@lmy002.wdf.sap.corp
9d3a1420d3 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/sap/mysql-5.0
 2005-03-16 08:56:32 +01:00
georg@lmy002.wdf.sap.corp
a9fde23474 typecast fix for windows 64-bit compilation error 2005-03-16 08:51:57 +01:00
lars@mysql.com
11f93ffd2d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1 2005-03-16 08:14:05 +01:00
jimw@mysql.com
3a6af0b28f Change mysql prompt while inside a multiline comment. (Bug #9186) 2005-03-15 17:33:06 -08:00
dlenev@brandersnatch.localdomain
f169114042 WL#874 "Extended LOAD DATA". 
Now one can use user variables as target for data loaded from file
(besides table's columns). Also LOAD DATA got new SET-clause in which
one can specify values for table columns as expressions.

For example the following is possible:
LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;

This patch also implements new way of replicating LOAD DATA.
Now we do it similarly to other queries.
We store LOAD DATA query in new Execute_load_query event
(which is last in the sequence of events representing LOAD DATA).
When we are executing this event we simply rewrite part of query which
holds name of file (we use name of temporary file) and then execute it
as usual query. In the beggining of this sequence we use Begin_load_query
event which is almost identical to Append_file event
 2005-03-16 04:32:47 +03:00
jimw@mysql.com
5e0d06da82 Fix 'tee' command in mysql client. (Bug #8499) 2005-03-15 16:37:05 -08:00
jimw@mysql.com
0a100d7464 Add support for showing table type to mysqlshow command. (Bug #5036) 2005-03-15 10:46:43 -08:00
reggie@mdk10.(none)
aa395b3a45 Merge mdk10.(none):/home/reggie/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-5.0
 2005-03-15 11:42:31 -06:00
reggie@mdk10.(none)
887f2a53fe Bug #6660 mysqldump creates bad pathnames on Windows 
This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.

mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660
sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.
 2005-03-15 11:33:06 -06:00
lars@mysql.com
26fae36137 BUG#9123: If a table name is given with an underscore, 
then this must be properly quoted when sent to 
SHOW TABLES LIKE ...
 2005-03-15 16:23:02 +01:00
reggie@mdk10.(none)
75e1b9e765 Bug #6660 mysqldump creates bad pathnames on Windows 
This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows.  However, this patch fixes the bug in mysqldump.c

mysqldump.c:
  Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
 2005-03-14 16:47:35 -06:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
jani@ua141d10.elisa.omakaista.fi
8db4423b8c Fixed Bug#8922. 
Reverted Jim's patch.
 2005-03-08 18:12:12 +02: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
georg@lmy002.wdf.sap.corp
877b2f4688 fixed conversion errors (Windows IA64 build) 2005-03-07 09:47:24 +01: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
monty@mysql.com
3839e443a4 merge with 4.1 2005-02-28 12:18:39 +02:00
bar@mysql.com
e42a8c454b mysqldump.c: 
Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client
 2005-02-25 18:12:53 +04:00
ramil@mysql.com
dee22632f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b4802
 2005-02-25 15:47:36 +04:00
guilhem@mysql.com
69fb5af28a mysqlbinlog: safety measures (safe setting for completion_type, 
auto-end-rollback in case crashed binlog) which cannot hurt.
 2005-02-23 19:18:14 +01:00
lars@mysql.com
7271a6014f Merge 4.1->5.0 2005-02-22 22:40:34 +01:00
monty@mysql.com
e2ea35ec67 Merge with 4.1 2005-02-22 15:47:00 +02:00
lars@mysql.com
6b06ff5956 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/bkroot/mysql-4.1
 2005-02-22 14:12:42 +01:00
lars@mysql.com
2d1089e8c1 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1 2005-02-22 13:22:34 +01:00
lars@mysql.com
1d3c67000b BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
monty@mysql.com
e2dc9b4099 Backport my_strntod() from 5.0 
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)
 2005-02-22 12:51:23 +02:00
lars@mysql.com
be28ef0a20 BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
bar@mysql.com
e2bd15eca2 mysql.cc: 
bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order.
 2005-02-21 15:43:25 +04:00
serg@serg.mylan
530eecbd99 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
 2005-02-17 14:00:44 +01:00
serg@serg.mylan
2b41b8fa01 post-review fixes. Now ROLLBACK is done in Format_description_log_event 2005-02-17 13:52:16 +01:00
monty@mysql.com
410e51c854 Fixed failing test cases 'row.test' when running with --ps-protocol 
Simple optimzations done while reviewing code
 2005-02-15 16:45:00 +02:00
serg@serg.mylan
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
mats@mysql.com
6611d3d2f8 Merge mysql.com:/home/bkroot/mysql-5.0 
into mysql.com:/home/bk/b7853-mysql-5.0
 2005-02-10 19:15:53 +01:00
monty@mysql.com
a1a39fab84 Merge with 4.1 2005-02-10 02:27:37 +02:00
serg@serg.mylan
db13afd89d auto-ROLLBACK if binlog was not closed properly 
auto-commit on Xid_log_event
 2005-02-09 20:04:28 +01:00
hf@deer.(none)
b94a482ee9 Precision Math implementation 2005-02-09 02:50:45 +04:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
jimw@mysql.com
8c8553af81 Merge changes 2005-02-04 11:59:02 -08:00
jimw@mysql.com
bd9239d4d7 Merge mysql.com:/home/jimw/my/mysql-4.1-8029 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-04 10:41:56 -08:00
mats@mysql.com
f6caefef2d Bug#7853 (mysqlbinlog does not accept input from stdin) 
The utility 'mysqlbinlog' now accepts input from stdin. It can 
  now be used to read the output from, e.g., 'zcat' or other utility.
 2005-02-04 14:29:54 +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
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
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
jimw@mysql.com
37edc3436e Fix 'mysqlcheck --help' to not specify what storage engines are 
supported, rather than give incorrect information. (Bug #8029)
 2005-02-02 15:03:34 -08: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
ramil@mysql.com
8cf2b82f94 After review fixes 2005-02-02 15:52:19 +04:00
ramil@mysql.com
7f68f132fd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b4802
 2005-02-02 15:06:36 +04: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
jimw@mysql.com
458c221e0d Add 'debug' to mysqladmin --help output. (Bug #8207) 2005-01-31 19:35:12 -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
b7dda3f7c0 Merge 2005-01-31 16:27:17 -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
reggie@bob.(none)
f953ef56f9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into bob.(none):/home/reggie/bk/mysql5.0
 2005-01-29 09:37:06 -06:00
reggie@bob.(none)
fc254d068f Merge 2005-01-29 09:34:36 -06:00
reggie@bob.(none)
9af0b70d9e Bug #5185 mysqldump for windows database gets table names with different case 
mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers
 2005-01-29 09:25:56 -06:00
jimw@mysql.com
71670605ac Use single quotes to set SQL_MODE in mysqldump output in case ANSI_QUOTES 
was already defined on the server the dump is loaded into. (Bug #8148)
 2005-01-28 11:16:49 -08: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
reggie@bob.(none)
e9e4d936dc Bug #5185 mysqldump for windows database gets table names with different case 
Added the get_actual_table_name function that issues a SHOW TABLES LIKE '%s'.  This will get the table 
name in the proper case.  We use this table name rather than the one given on the command line.  This will
prevent problems when importing SQL on Linux that was generated on a Windows platform where case can be
an issue.

mysqldump.c:
  call get_actual_table_name to get the table name in the proper case
 2005-01-27 14:48:26 -06:00
serg@serg.mylan
160f254d34 merged 2005-01-26 09:54:12 +01:00
jimw@mysql.com
ec98b8f235 Change 'mysql' client to output XML like the 'mysqldump' 
tool does, with the column names as attributes on <field>
elements, instead of trying to use the column name as the
element name. Also fix some encoding issues. (Bug #7811)
 2005-01-25 14:25:40 -08: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
jani@ua141d10.elisa.omakaista.fi
d5f76d50f6 Some bug fixes and a feature add to mysql-test-run 2005-01-25 18:32:09 +02:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
serg@serg.mylan
79240013b2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
dlenev@brandersnatch.localdomain
e906e86121 After merge fix. 2005-01-18 22:24:22 +03:00
dlenev@mysql.com
5f21e5ac47 Merge mysql.com:/home/dlenev/src/mysql-4.1-merges 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-18 22:13:05 +03:00
jani@ua141d10.elisa.omakaista.fi
625ae2c5a0 Added possibility to use --error <name> instead of --error <number> 
The old syntax works as well. WL#2356.
 2005-01-18 20:16:21 +02:00
konstantin@mysql.com
0e56df7572 Cleanups in Makefile.ams 2005-01-18 17:26:04 +03:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
reggie@bob.(none)
da9f7c7ec4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql-4.1
 2005-01-17 14:08:36 -06:00
paul@kite-hub.kitebird.com
3b9c5f3a17 mysqldump.c: 
Move out-of-order option.
 2005-01-17 00:09:47 -06:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
guilhem@mysql.com
6412558d03 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-16 21:39:20 +01:00
reggie@bob.(none)
68c540f090 Bug #7922 prompt \p fails on Windows for shared-memory connections 
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
 2005-01-15 23:19:34 -06: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
serg@serg.mylan
275a9293e4 protect against malicious server trying to crash command-line client :) 2005-01-14 22:46:04 +01:00
guilhem@mysql.com
980d1b658e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 10:59:37 +01:00
jani@ua141d10.elisa.omakaista.fi
f3e73e26d7 A patch for Netware. 2005-01-13 19:24:54 +02:00
guilhem@mysql.com
84bc0db087 Fix for BUG#7850: force the transaction isolation level to REPEATABLE READ when --single-transaction 2005-01-13 00:44:13 +01:00
monty@mysql.com
f4274fe9be Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-11 19:35:00 +02:00
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
monty@mysql.com
2677a1c46b Review of new pushed code 
Indentation cleanup
 2005-01-11 18:55:53 +02:00
hf@deer.(none)
8b3b364893 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.5920
 2005-01-11 19:58:52 +04:00
pekka@mysql.com
195f7bda02 Merge 2005-01-08 22:34:16 +01:00
serg@sergbook.mylan
247052fecc few harmless warnings from automated code-checking tools fixed 2005-01-08 21:25:31 +01:00
jimw@mysql.com
5010be1d8b Merge mysql.com:/home/jwinstead2/mysql-4.1-clean 
into mysql.com:/home/jwinstead2/mysql-5.0
 2005-01-06 21:39:57 +01:00
bell@sanja.is.com.ua
a8861fe9ec Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2005-01-06 20:49:27 +02:00
bell@sanja.is.com.ua
d944dc9a78 postreview changes 2005-01-06 20:47:08 +02:00
bell@sanja.is.com.ua
779c33a5e7 fixed comparation with string constant on some platform (BUG#7651) 2005-01-06 19:13:58 +02:00
jimw@mysql.com
d4b236fe8f Merge mysql.com:/home/jwinstead2/mysql-4.1-7451 
into mysql.com:/home/jwinstead2/mysql-4.1-clean
 2005-01-06 17:27:48 +01:00
jimw@mysql.com
9971b2f0f5 Add support for --default-character-set to mysqladmin (Bug #7524) 2005-01-06 01:08:03 +01:00
jimw@mysql.com
4d025523e5 Fix "mysqladmin password" to use correct password scrambling function when 
talking to pre-4.1 servers or 4.1 and later servers where the old_passwords
option is enabled. "mysqladmin old-password" is unchanged. (Bug #7451)
 2005-01-05 21:56:18 +01:00
hf@deer.(none)
5eb5fd12be fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file) 2005-01-03 19:21:54 +04:00
wax@mysql.com
36edf8297a Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1test2
 2005-01-02 20:01:08 +05:00
wax@kishkin.ru
9d5fc07494 WL#964 
move my_end() after free_used_memory()
 2005-01-02 19:58:49 +05:00
serg@sergbook.mysql.com
a04fc26c54 manually merged 2004-12-31 15:26:24 +01:00
dlenev@mysql.com
536cb92195 Manual merge. 2004-12-31 12:48:27 +03:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
dlenev@mysql.com
a8deefa3dd Manual merge of patch implementing WL#1339 with main tree. 2004-12-29 22:35:16 +03:00
dlenev@brandersnatch.localdomain
ffa7393330 WL#1339 "Add per account max_user_connections limit (maximum number 
of concurrent connections for the same account)"

Added support of account specific max_user_connections limit. Made all
user limits to be counted per account instead of the old behavior,
which was per user/host accounting. Added option which enables the old
behavior. Added testing of these to the test suite.

(After review version).
 2004-12-29 20:30:37 +03:00
serg@serg.mylan
cf6e2214d8 client/mysqldump.c 
compilation failure fixed
    cleanup
 2004-12-28 17:33:49 +01:00
lars@mysql.com
967fac4ef6 WL#2319 V2: Exclude tables from dump 
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped
 2004-12-27 19:10:30 +01:00
bar@mysql.com
e53b446a73 Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8 
See mysqldump.test comments for more details
 2004-12-22 16:02:27 +04:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
ram@gw.mysql.r18.ru
22f3ca4d8e A fix (bug #7283: Test failure: 'update' (using '--ps-protocol': server crash)). 2004-12-20 20:18:17 +04:00
paul@frost.snake.net
66f0ff16a3 mysql.cc: 
Fix up mysql help messages.
 2004-12-18 14:30:00 -06:00
guilhem@mysql.com
884663662b Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it 
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).
 2004-12-17 23:37:43 +01: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
f9451974be WL#1051, more maintanable error messages. 2004-12-13 22:51:54 +02:00
monty@mysql.com
3b14ba64fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2004-12-12 18:44:15 +02:00
gluh@gluh.mysql.r18.ru
58e75f6f24 fix according to review 2004-12-10 18:25:12 +03:00
kent@mysql.com
081fdcc2e1 Makefile.am: 
Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
  when linking. For -all-static linking libtool put -lc after the .la
  file and this put the libc regex functions before our regex functions
  when linking on Linux.
 2004-12-10 13:06:58 +01:00
gluh@gluh.mysql.r18.ru
2e912bbbe8 Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges 
mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable
 2004-12-10 12:07:11 +03:00
monty@mysql.com
36d11d950a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2004-12-10 02:58:39 +02:00
guilhem@mysql.com
eac128ef2d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2004-12-09 15:42:06 +01:00
guilhem@mysql.com
1cbc904c59 Changing the default of libmysqlclient : it's now NO reconnection. 
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
 2004-12-09 14:44:10 +01:00
monty@mysql.com
b68f2307e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-12-09 12:50:37 +02:00
monty@mysql.com
01e4740f4c Ensure that we free memory used with --order-by-primary (in mysqldump) 
Simple, non critical, fix to mysql_fix_privilege_tables
 2004-12-09 12:47:20 +02:00
monty@mysql.com
1316954b3f Fixed that mysql-test-run --ps-protocol works with system_mysql_db_fix.test 2004-12-08 01:17:52 +02:00
monty@mysql.com
77207d19f2 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535) 
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
 2004-12-06 02:00:37 +02:00
serg@serg.mylan
9c23871867 help text corrected 2004-12-04 10:06:38 +01:00
tsmith@build.mysql.com
88f48f33c5 Merge bk-internal:/home/bk/mysql-4.1 
into build.mysql.com:/users/tsmith/m/41/b
 2004-12-02 15:33:12 +01:00
konstantin@mysql.com
dc4f845103 Fix for Bug#6377 "Password Generation Discrepancy" 2004-12-02 14:28:59 +03:00
brian@avenger.(none)
b85f4677d5 Merge for Matt for Innodb bug. 2004-11-30 10:10:40 -08:00
ram@gw.mysql.r18.ru
0ca8fd2ee9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
 2004-11-30 12:27:17 +04:00
tsmith@build.mysql.com
c02e81b018 Merge 2004-11-30 03:24:17 +01:00
tsmith@build.mysql.com
6968523df1 mysqldump.c: 
minor cleanup to the --order-by-primary feature code
 2004-11-30 02:26:24 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
57b30a1eef Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b09068f8a4 Applied some Netware related patches. 2004-11-29 17:41:47 +02:00
brian@avenger.(none)
2b0b6ec20c Merging 4.1 to 5.0 2004-11-24 12:34:44 -08:00
joerg@mysql.com
9e467cc009 Merge from 4.0 for immediate use in the current 5.0 builds. 2004-11-24 17:32:11 +01:00
joerg@mysql.com
c356b37b0c Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1 2004-11-24 15:29:35 +01:00
joerg@mysql.com
cf722bc3f5 Ensure consistent sources up to 5.0 where a C++ problem occurs. 2004-11-24 15:24:23 +01:00
joreland@mysql.com
5ac41f60e3 merge error 2004-11-24 12:33:09 +01:00
joreland@mysql.com
41222efa7b Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/wl2077
 2004-11-22 08:20:34 +01:00
paul@kite-hub.kitebird.com
4720cc1fae Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
 2004-11-20 15:22:57 -06:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00