mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31362 commits 2791 branches 343 tags 1.7 GiB
Commit graph

1683 commits

Author SHA1 Message Date
brian@zim.tangent.org
faa1b42989 Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 2006-02-19 09:41:59 -08:00
msvensson@neptunus.(none)
e592227529 Fix build failure 2006-02-18 16:18:51 +01:00
kent@mysql.com
a50023d772 mysqlimport.c: 
Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
  Changed __WIN32__ to __WIN__
dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug.vcproj:
  Define __WIN__ for all targets
 2006-02-18 08:46:18 +01:00
kent@mysql.com
9aca849da1 Makefile.am: 
Add an extra -lpthread before first -lc, to solve link
  problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
  Added copying of the include/mysql directory
 2006-02-18 04:23:24 +01:00
msvensson@neptunus.(none)
ace6f14267 Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory 
- Disable --use-threads option in 5.1.7
 2006-02-17 18:19:29 +01:00
msvensson@neptunus.(none)
a50d87da34 Fix after review 2006-02-17 17:16:18 +01:00
msvensson@neptunus.(none)
7632371576 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-17 15:56:01 +01:00
msvensson@neptunus.(none)
e96353cf55 Bug#17382 mysql-test-run mysqldump fails with mysqlimport 
- Remove global  MYSQL connection variable
 2006-02-17 15:52:05 +01:00
paul@snake-hub.snake.net
3a9bfb00c8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-17 08:33:47 -06:00
paul@snake-hub.snake.net
22f630f59a mysqlcheck.c: 
Tweak --check-upgrade help text.
 2006-02-17 08:32:52 -06:00
msvensson@neptunus.(none)
01cd7a05c7 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
 2006-02-17 12:16:36 +01:00
msvensson@neptunus.(none)
b951068d62 Replace win filename s with unix equivalent 
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.
 2006-02-17 12:07:45 +01:00
holyfoot@mysql.com
0841480e1e merging 2006-02-17 14:39:38 +04:00
bar@mysql.com
d0e4df18e6 client_priv.h: 
Sorry, forgot to push in the previous changeset.
 2006-02-17 13:10:12 +04:00
bar@mysql.com
ed4f5ac923 mysqlcheck.c: 
WL#3046  Migration tool for 5.1 table-name encoding
 2006-02-17 12:10:36 +04:00
holyfoot@mysql.com
be02944df6 Merging 5.0->5.1 2006-02-17 11:26:03 +04:00
holyfoot@mysql.com
77605c3576 Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into mysql.com:/home/hf/work/mysql-5.1.w2645
 2006-02-17 11:12:05 +04:00
holyfoot@deer.(none)
053d90a234 WL#2645 (CHECK TABLE FOR UPGRADE) 
necessary implementation in the server
mysql_upgrade script added
 2006-02-17 10:52:32 +04:00
paul@snake-hub.snake.net
a9cda1edd3 mysqlcheck.c: 
Fix out of order options.
 2006-02-16 10:00:14 -06:00
serg@serg.mylan
6c7dd562fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-02-16 14:53:36 +01:00
serg@serg.mylan
661371538b missing DBUG_RETURN 2006-02-16 12:31:33 +01:00
msvensson@neptunus.(none)
3fc22ca4b9 Bug#13809 mysql-test: --replace_result option works on Windows incorrect 2006-02-16 00:53:55 +01:00
msvensson@neptunus.(none)
cac0931b8c Add possibility to have a negative expression in "if" and "while" in mysqltest 2006-02-15 22:43:42 +01:00
jimw@mysql.com
d33b03abef Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-15 12:06:20 -08:00
jimw@mysql.com
e75a62aeae Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2006-02-15 07:36:33 -08:00
serg@serg.mylan
d5294e86bf Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-02-15 14:04:56 +01:00
msvensson@neptunus.(none)
56ef2e28e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-15 12:02:20 +01:00
jimw@mysql.com
d70c47b2a9 Merge mysql.com:/home/jimw/my/mysql-4.1-16389 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2006-02-14 18:12:30 -08:00
serg@serg.mylan
48b8e842ca Automerge 2006-02-15 00:01:46 +01:00
serg@serg.mylan
63cfd11859 dbug changes: 
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
 2006-02-14 22:36:11 +01:00
aelkin@mysql.com
7397bc8fb4 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
 2006-02-14 20:48:34 +02:00
paul@snake-hub.snake.net
8298c79b6b Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-14 12:18:23 -06:00
paul@snake-hub.snake.net
bf683f51bc mysqlimport.c: 
Revise option description for --help message.
 2006-02-14 12:11:26 -06:00
msvensson@neptunus.(none)
fed5a68ea8 Merge neptunus.(none):/home/msvensson/mysql/bug17280/my50-bug17280 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-14 15:34:30 +01:00
brian@zim.tangent.org
abf4f17761 Fixed comments bug#17239 2006-02-13 19:09:10 -08:00
kent@mysql.com
d60b10d565 mysqlimport.c: 
Removed C++ comment, changed types for pthread_create() usage
 2006-02-13 20:21:15 +01:00
brian@zim.tangent.org
f76c047305 Made mysqlimport link against mysys so that it could make use of the safe mutex functions. 2006-02-13 04:48:14 -08:00
brian@zim.tangent.org
a33a7e274f Cleanup's from Kostja's review. Plus I added a bit more documentation to the --lock-tables option. If selected it disables threads (since you can't quite do it with threads). 2006-02-13 04:04:53 -08:00
msvensson@neptunus.(none)
e486d81a52 Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-13 10:56:45 +01:00
brian@zim.tangent.org
7f3d7af7ae Adding thread support for mysqlimport. You can now specify a number of threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this. 2006-02-13 00:45:59 -08:00
msvensson@neptunus.(none)
5000951ab4 Bug#14013 mysql_stmt_store_result() bombs if a cursor is open 
- Add code to 'mysql_stmt_store_result' to allow it to be called on 
   a prepared statement with open server side cursor.
 - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
 2006-02-10 14:50:29 +01:00
aelkin@mysql.com
14ced05e55 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part. 
This changeset is assumed to stay in 4.1.
 2006-02-10 15:12:27 +02:00
knielsen@mysql.com
abcf6ccebb Changes to make testsuite run in CMake build tree. 2006-02-10 13:29:01 +01:00
msvensson@neptunus.(none)
4217699e56 Bug#17280 mysqltest, --echo sometimes does not expand $variables 
- Evaluate all variables in the text before printing it to result file
 2006-02-10 12:11:16 +01:00
aelkin@mysql.com
dd2a44c497 BUG#16217 forced to introduce a separate mysql client command to adopt its 
internal charset to one associated with currently being handled query. 
To note such a query can come from interactive client either.

There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side 
character set. 
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.

Interactive human can switch between many multi-byte charsets during the session 
providing the command explicitly. 
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
 2006-02-09 16:23:09 +02:00
msvensson@neptunus.(none)
bbff8ade1a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
 2006-02-07 18:17:57 +01:00
konstantin@mysql.com
e3663e7659 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 20:54:07 +03:00
tomas@poseidon.ndb.mysql.com
ce8308a503 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-02 16:19:49 +01:00
konstantin@mysql.com
92b41ba92a Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 16:57:34 +03:00
msvensson@neptunus.(none)
c9b7317ff9 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-02 11:47:01 +01:00