Commit graph

1121 commits

Author SHA1 Message Date
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02: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
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